From f20a4f5872644b829c061ed02f469246c2bc3b8e Mon Sep 17 00:00:00 2001 From: Ferdinand Galko Date: Mon, 24 Jul 2023 14:05:35 +0000 Subject: [PATCH 001/127] Translated using Weblate (Slovak) Currently translated at 100.0% (1677 of 1677 strings) Translation: uyuni/spacecmd Translate-URL: https://l10n.opensuse.org/projects/uyuni/spacecmd/sk/ --- spacecmd/po/sk.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spacecmd/po/sk.po b/spacecmd/po/sk.po index 9494c4bdc2bb..4938be58df8a 100644 --- a/spacecmd/po/sk.po +++ b/spacecmd/po/sk.po @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-21 15:08+0200\n" -"PO-Revision-Date: 2023-05-05 17:14+0000\n" +"PO-Revision-Date: 2023-07-24 16:15+0000\n" "Last-Translator: Ferdinand Galko \n" -"Language-Team: Slovak \n" +"Language-Team: Slovak " +"\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1564,12 +1564,10 @@ msgstr "" " -f SÚBOR_KĽÚČA" #: ../src/spacecmd/cryptokey.py:69 -#, fuzzy msgid "cryptokey_update: Update a cryptographic key" -msgstr "cryptokey_create: Vytvoriť šifrovací kľúč" +msgstr "cryptokey_update: Aktualizovať šifrovací kľúč" #: ../src/spacecmd/cryptokey.py:70 -#, fuzzy msgid "" "usage: cryptokey_update [options])\n" "\n" @@ -1578,7 +1576,7 @@ msgid "" " -d DESCRIPTION\n" " -f KEY_FILE" msgstr "" -"použitie: cryptokey_create [voľby])\n" +"použitie: cryptokey_update [voľby])\n" "\n" "voľby:\n" " -t GPG alebo SSL\n" From bc09732c5eb738489fba690a3a8ce6f3c3f6d43b Mon Sep 17 00:00:00 2001 From: Ferdinand Galko Date: Wed, 26 Jul 2023 14:17:58 +0000 Subject: [PATCH 002/127] Translated using Weblate (Slovak) Currently translated at 100.0% (1677 of 1677 strings) Translation: uyuni/spacecmd Translate-URL: https://l10n.opensuse.org/projects/uyuni/spacecmd/sk/ --- spacecmd/po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spacecmd/po/sk.po b/spacecmd/po/sk.po index 4938be58df8a..e7aa263178f0 100644 --- a/spacecmd/po/sk.po +++ b/spacecmd/po/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-21 15:08+0200\n" -"PO-Revision-Date: 2023-07-24 16:15+0000\n" +"PO-Revision-Date: 2023-07-26 17:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak " "\n" @@ -3270,7 +3270,7 @@ msgstr " * Podrobnosti->Voľby jadra" #: ../src/spacecmd/kickstart.py:2570 #, python-format msgid " * Details->Post Kernel Options : %s" -msgstr " * Podrobnosti->Voľby jadra po : %s" +msgstr " * Podrobnosti->Následné voľby jadra : %s" #: ../src/spacecmd/kickstart.py:2586 msgid "no kickstart label given" From b16519f123d7791e198f28e7d19823423a89e092 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 28 Jul 2023 15:10:47 +0200 Subject: [PATCH 003/127] update strings for translations in web --- web/po/cs.po | 618 +++++++++++++++++++++----------------- web/po/de.po | 560 ++++++++++++++++++----------------- web/po/es.po | 594 +++++++++++++++++++------------------ web/po/fr.po | 521 ++++++++++++++++---------------- web/po/it.po | 539 ++++++++++++++++----------------- web/po/ja.po | 623 ++++++++++++++++++++++----------------- web/po/ko.po | 620 +++++++++++++++++++++----------------- web/po/pt.po | 526 ++++++++++++++++----------------- web/po/pt_BR.po | 564 ++++++++++++++++++----------------- web/po/si.po | 521 ++++++++++++++++---------------- web/po/sk.po | 620 +++++++++++++++++++++----------------- web/po/spacewalk-web.pot | 521 ++++++++++++++++---------------- web/po/zh_CN.po | 620 +++++++++++++++++++++----------------- web/po/zh_HK.po | 521 ++++++++++++++++---------------- web/po/zh_TW.po | 521 ++++++++++++++++---------------- 15 files changed, 4448 insertions(+), 4041 deletions(-) diff --git a/web/po/cs.po b/web/po/cs.po index f127418271ab..712a92c2624f 100644 --- a/web/po/cs.po +++ b/web/po/cs.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2022-09-19 19:13+0000\n" "Last-Translator: Aleš Kastner \n" "Language-Team: Czech \n" @@ -45,15 +44,17 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "Vzorec uložen. U tohoto vzorce není potřeba použít highstate." -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "Zadejte prosím povinná pole: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +#, fuzzy +msgid "Invalid format of fields: {fields}" msgstr "Neplatný formát polí: {0}" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -61,19 +62,19 @@ msgstr "" "Na této stránce můžete nakonfigurovat vzorce Salt pro automatickou instalaci " "a konfiguraci softwaru." -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "Rozbalit všechny sekce" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "Sbalit všechny sekce" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "Bez názvu" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "Vyhledat podle názvu skupiny vzorců" @@ -132,12 +133,17 @@ msgstr "" msgid "Next year" msgstr "Další" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +#, fuzzy +msgid "Are you sure you want to {action} {name}" msgstr "Opravdu chcete {0} {1} " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +#, fuzzy +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "Opravdu chcete {0} vybrané {1}? (Vybráno {2} {1})" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -146,9 +152,9 @@ msgstr "Opravdu chcete {0} vybrané {1}? (Vybráno {2} {1})" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -164,7 +170,8 @@ msgstr "Zrušit" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -274,39 +281,28 @@ msgstr "Začněte psát..." msgid "No flavor" msgstr "Bez variant" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 #, fuzzy -msgid "Action has been successfully added to the action chain '{0}'." +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "Akce byla úspěšně přidána do Řetězce akcí " -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "naplánována" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 #, fuzzy -msgid "The action has been {0}." -msgstr "Akce byla " +msgid "The action has been scheduled." +msgstr "Import obrazu byl naplánován." -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 #, fuzzy msgid "Unable to clear selection" msgstr "Zpět k výběru systému" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -316,20 +312,20 @@ msgstr "" msgid "Confirm" msgstr "Potvrdit" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "Zpět na seznam" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 #, fuzzy msgid "Filter by package name" msgstr "Filtrovat podle názvu" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -367,18 +363,12 @@ msgid "Last" msgstr "Poslední" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "Strana" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "z" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "Strana {0} z {1}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -481,7 +471,8 @@ msgid "There are no entries to show." msgstr "Žádné položky k zobrazení." #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "Konfigurační kanál: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -530,8 +521,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "Nebyly přiřazeny žádné stavy. Vyhledáváním najděte a přiřaďte stavy." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -546,8 +537,8 @@ msgid "Back" msgstr "Zpět" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "Uložit změny" @@ -559,24 +550,16 @@ msgstr "Výkonné stavy" msgid "Reorder" msgstr "Přeuspořádat" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Stát" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 +#: ../html/src/components/states-picker.tsx:385 #, fuzzy -msgid "configuration channels" -msgstr "Konfigurační kanály" +msgid "Search in states" +msgstr "Vyhledávat systémy" #: ../html/src/components/states-picker.tsx:385 -#, fuzzy -msgid "Search in {0}" -msgstr "Vyhledávání" +msgid "Search in configuration channels" +msgstr "Hledat v konfiguračních kanálech" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -584,59 +567,51 @@ msgstr "Vyhledávání" msgid "Search" msgstr "Vyhledávání" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Stát" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "Výkonné stavy" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "Kanál" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" +msgstr "Kanály SUSE" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" -msgstr "" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "Přetažením upravte pořadí konfiguračních kanálů." #: ../html/src/components/states-picker.tsx:405 #, fuzzy -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "Přetažením upravte pořadí konfiguračních kanálů." -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "Nejsou přiřazeny žádné stavy." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Poslední jméno (příjmení)" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "Název kanálu" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Stavový kanál" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "Označení kanálu" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -652,7 +627,7 @@ msgstr "Označení kanálu" msgid "Description" msgstr "Popis" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "Přiřadit" @@ -677,7 +652,7 @@ msgid "Non-Virtual System" msgstr "Virtuální systém" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "Proxy" @@ -707,21 +682,23 @@ msgstr "Filtry" msgid "Select a filter" msgstr "Vybrat plán" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "Položky {0} - {1} z {2}" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" -msgstr "(Vybráno: {0})" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" +msgstr "Odstranit vybrané" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vyčistit" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "Vybrat vše" @@ -785,6 +762,19 @@ msgstr "žádný" msgid "Require this channel" msgstr "Vyžadovat tento kanál" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "foo" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "nedefinováno" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "Změny konfigurace se projeví po restartu počítače." @@ -868,7 +858,7 @@ msgstr "Nastala chyba. Stav monitorování neznámý. Obnovte stránku." #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1052,7 +1042,7 @@ msgstr "Filtrovat podle libovolné hodnoty" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "Hostitel" @@ -1077,6 +1067,12 @@ msgstr "Stav poslední aktualizace" msgid "never" msgstr "nikdy" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "z" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "Přidat platbu podle potřeby" @@ -1104,7 +1100,7 @@ msgstr "Vlastnosti Platby dle potřeby aktualizovány úspěšně" msgid "Edit Information" msgstr "Upravit informace" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "Úprava vlastností.." @@ -1117,7 +1113,7 @@ msgstr "Poslední aktualizace stavu" msgid "Edit " msgstr "Upravit " -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "Úprava údajů o připojení ssh.." @@ -1129,53 +1125,54 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "Port SSH" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "Uživatel" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Heslo" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "Privátní klíč SSH" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "Heslo privátního klíče SSH" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "Hledaná instance neexistuje nebo byla odstraněna" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +#, fuzzy +msgid "Instance Hostname: {host}" msgstr "Název hostitele instance: {0}" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "Zrušit průběžnou platbu (Pay-as-you-go)" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "Opravdu chcete odstranit projekt" @@ -1212,7 +1209,7 @@ msgstr "Operace nebyla úspěšná: Prázdná odpověď ze serveru" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "Podrobnosti" @@ -1242,7 +1239,8 @@ msgstr "Některé změny byly úspěšně naplánovány." #: ../html/src/manager/admin/setup/products/products.tsx:270 #, fuzzy msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" "Následující instalace produktů selhaly. Zkontrolujte žurnálové soubory." @@ -1639,6 +1637,14 @@ msgstr "Přebudovat" msgid "Patch available but needs to be cloned into Channel." msgstr "Záplata je k dispozici, ale je třeba ji naklonovat do kanálu." +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "Kanál" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "Opravník chyb" @@ -1668,34 +1674,37 @@ msgstr "Momentálně nejsou k dispozici žádná data o shodě." msgid "You can also trigger a first run now by clicking the button below." msgstr "Teď můžete také spustit první běh kliknutím na tlačítko níže." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +#, fuzzy +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "Právě {0} bylo zahájeno přepočítávají párovacích dat." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 +#, fuzzy msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" "Údaje o poslední úspěšné shodě byly vypočítány {0}. Nový běh můžete spustit " "kliknutím na tlačítko níže." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" "Data o shodě se počítají podle plánu úkolů, ve výchozím nastavení každou noc " "(můžete " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "změňte plán úkolů na stránce správy" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "). " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "Obnovit párovací data" @@ -2091,7 +2100,7 @@ msgstr "Epocha" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2248,7 +2257,7 @@ msgid "Last Build" msgstr "Poslední sestavení" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "Životní cyklus životního prostředí" @@ -2257,7 +2266,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "Hledaný projekt neexistuje nebo byl odstraněn" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +#, fuzzy +msgid "Content Lifecycle Project - {name}" msgstr "Projekt životního cyklu obsahu - {0}" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2454,12 +2464,13 @@ msgstr "povolit modul" msgid "disable all modules" msgstr "povolit modul" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" msgstr "Sestavení ({0})" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2468,15 +2479,16 @@ msgstr "Sestavení ({0})" msgid "Build" msgstr "Sestavení" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "Sestavit projekt" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" msgstr "Sestavuji projekt.." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." @@ -2484,16 +2496,18 @@ msgstr "" "Projekt obsahuje kanály s nesynchronizovanými záplatami. Budou " "synchronizovány způsobem dle nastavení Vaší organizace." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "Zpráva o verzi" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +#, fuzzy +msgid "Version {version} history" msgstr "Historie verze {0}" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +#, fuzzy +msgid "Version {version} successfully built into {environmentName}" msgstr "Verze {0} úspěšně zabudována do {1}" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2514,34 +2528,36 @@ msgstr "Označení" msgid "Insert before" msgstr "Vložte před" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "Přidat prostředí" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "Prostředí vytvořeno úspěšně" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "Vytváření prostředí..." -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "Nebyla vytvořena žádná prostředí" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "Prostředí aktualizováno úspěšně" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" msgstr "Prostředí {0} úspěšně odstraněno" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 +#, fuzzy msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" "Toto prostředí nelze odstranit, protože se používá v {0}autoinstalační " "distribuci{1}." @@ -2591,7 +2607,8 @@ msgid "Create New Filter" msgstr "Vytvořit nový filtr" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +#, fuzzy +msgid "Edit Filter {name}" msgstr "Upravit filtr {0}" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2628,7 +2645,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "Žádná verze k povýšení nebo probíhá sestavení s kolizi prostředí" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "Povýšit" @@ -2641,15 +2658,17 @@ msgid "Target environment" msgstr "Cílové prostředí" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +#, fuzzy +msgid "Promote version {version} into {environmentName}" msgstr "Povýšit verzi {0} na {1}" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "Povýšení prostředí" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +#, fuzzy +msgid "Version {version} successfully promoted into {environmentName}" msgstr "Verze {0} úspěšně povýšena na {1}" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2767,7 +2786,8 @@ msgid "Page Not Found" msgstr "Stránka nenalezena" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +#, fuzzy +msgid "The page you requested, {currentUrl}, was not found." msgstr "Požadovaná stránka {0} se nenašla." #: ../html/src/manager/errors/not-found.tsx:12 @@ -2824,7 +2844,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "Highstate" @@ -2854,7 +2874,7 @@ msgstr "Systémy" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2862,7 +2882,7 @@ msgstr "Balíčky" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2898,6 +2918,16 @@ msgstr "Akce byla úspěšně přidána do Řetězce akcí " msgid "Building the image has been " msgstr "Sestavení obrazu bylo " +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "naplánována" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "Souhrn profilu" @@ -2924,7 +2954,7 @@ msgstr "Cesta" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "Aktivační klíč" @@ -2987,7 +3017,7 @@ msgstr "Import" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "Vymazat pole" @@ -3095,9 +3125,11 @@ msgstr "Odstranit vybraný/-é profil/-y" msgid "Are you sure you want to delete the selected profile?" msgstr "Opravdu chcete odstranit vybraný profil?" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "Opravdu chcete odstranit vybrané profily? (Vybráno {0} profilů)" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -3105,7 +3137,7 @@ msgid "Use credentials" msgstr "Použít pověření" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3163,12 +3195,14 @@ msgstr "Odstranit vybrané(-á) úložiště" msgid "Are you sure you want to delete the selected store?" msgstr "Opravdu chcete smazat vybrané úložiště?" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "Opravdu chcete smazat zvolená úložiště? (Vybráno {0} úložišť)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "Protokol sestavení" @@ -3285,8 +3319,9 @@ msgid "Edit store" msgstr "Upravit úložiště" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "Podrobnosti instance pro '{0}'" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3482,7 +3517,7 @@ msgid "Unknown" msgstr "Neznámý" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "Runtime" @@ -3518,11 +3553,13 @@ msgstr "Odstranit vybrané obrazy" msgid "Are you sure you want to delete the selected image?" msgstr "Opravdu chcete odstranit vybraný obraz?" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "Opravdu chcete odstranit vybrané obrazy? (Vybráno {0} obrazů)" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Přehled" @@ -3579,12 +3616,12 @@ msgid "" msgstr "" "Osvojte si nový způsob správy serverů, balíčků, oprav atd. jedním rozhraním." -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" -msgstr "_prázdný" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." +msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3616,31 +3653,31 @@ msgstr "Poznat více o" msgid "Login" msgstr "Přihlášení" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "Přeskočit na poslední okno údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "Přeskočit na další okno údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "Žádná okna předchozí údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "Žádná okna budoucí údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "Dnes" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "Měsíc" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "Den" @@ -3695,7 +3732,7 @@ msgid "Delete maintenance schedule" msgstr "Smazat plán údržby" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "Přiřazené systémy" @@ -3726,11 +3763,12 @@ msgstr "Násobný" msgid "Schedule Details" msgstr "Podrobnosti plánu" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +#, fuzzy +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "Plán údržby byl přiřazen {0} systémům" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3738,16 +3776,17 @@ msgstr "Plán údržby byl přiřazen {0} systémům" msgid "Cancel affected actions" msgstr "Zrušit ovlivněné akce" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "Vyhledávat systémy" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "Aktuální plán" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +#, fuzzy +msgid "Url '{url}' is invalid" msgstr "URL '{0}' je neplatné" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3911,7 +3950,8 @@ msgid "Maintenance Schedules" msgstr "Plány údržby" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +#, fuzzy +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "Přiřadit plán údržby {0} systémům" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -4004,7 +4044,7 @@ msgstr "Načítání obsahu scénářů..." #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "Testový režim" @@ -4017,7 +4057,8 @@ msgid "Schedule playbook execution" msgstr "Naplánovat provedení scénáře" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +#, fuzzy +msgid "Playbook '{name}'" msgstr "Scénář '{0}'" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4110,6 +4151,15 @@ msgstr "Odstraněno" msgid "Package States" msgstr "Stavy balíčku" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Stát" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "Stavy balíčku byly uloženy." @@ -4429,7 +4479,7 @@ msgid "Proxy SSH port" msgstr "Port proxy SSH" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "Rozsah portů: 1 - 65535" @@ -4618,7 +4668,7 @@ msgstr "Opravdu chcete tento plán smazat?" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 #, fuzzy -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "Kanál konfigurace stavu" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4708,9 +4758,10 @@ msgid "Error when deleting the action. Check if Taskomatic is running" msgstr "Chyba při odstraňování akce. Zkontrolujte, zda běží Taskomatic" #: ../html/src/manager/recurring/recurring-actions.tsx:148 +#, fuzzy msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" "Níže uvedené časy jsou zobrazeny v časovém pásmu serveru {0}. Naplánovaný " "čas bude časem serveru." @@ -4813,7 +4864,8 @@ msgid "No minions matched the target expression." msgstr "Cílovému výrazu neodpovídají žádní sledující." #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +#, fuzzy +msgid "Server returned an error: {message}" msgstr "Server vrátil chybu: {0}" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4897,7 +4949,8 @@ msgid "Manager" msgstr "Manažer" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +#, fuzzy +msgid "State Summary for {name}" msgstr "Souhrn stavu pro {0}" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4942,14 +4995,14 @@ msgstr "Systémová skupina" #: ../html/src/manager/state/highstate.tsx:71 #, fuzzy -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "Použití highstate bylo " -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "Použít Highstate" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "Vytvořit opakování" @@ -5056,45 +5109,38 @@ msgstr "" "Žádost přerušena nebo ze serveru přijata neplatná odpověď. Zkontrolujte, zda " "byl váš sledující klient správně zaveden." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "Hostitel byl úspěšně spuštěn! Váš systém by se měl objevit v" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "systémy" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "Zobrazit další podrobnosti o této chybě" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "Nelze zavést OS hostitele. Došlo k následujícím chybám:" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "Váš systém se zavádí: čekám na odpověď.." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "Načítání privátního klíče SSH.." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "Zavést systém" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "např. ••••••••••••" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" @@ -5102,61 +5148,64 @@ msgstr "" "Soubor bude uložen v dočasném souboru na serveru a bude odstraněn po " "proceduře zavedení systému" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "Není-li heslo, ponechte prázdné" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "Zavádění systémů u sledujících (minion) klientů" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 +#, fuzzy msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" "Můžete přidat systémy do správy pouze poskytnutím přihlašovacích údajů SSH. " "{0} připraví systém na dálku a registroje ho." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "např. host.doman.com" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 +#, fuzzy msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" "Uživatel bude mít účinek pouze během procesu bootstrap. Další připojení " "budou provedena uživatelem uvedeným v rhn.conf. Výchozí uživatel pro klíč " "'ssh_push_sudo_user' je 'root'. Tento uživatel je nastaven, až je během " "bootstrapu umístěn SSH klíč {0}." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "Metoda ověřování" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "Řídicí uzel Ansible" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "Žádný" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "Re-aktivační klíč" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "Nechte prázdné, není-li požadována re-aktivace" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." @@ -5164,15 +5213,15 @@ msgstr "" "Hostitelský název proxy není plně kvalifikován. To může způsobit problémy " "při přístupu ke kanálům." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "Zakázat striktní kontrolu klíče hostitele SSH během zaváděcího procesu" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "Správa systému kompletně přes SSH (neinstaluje agenta)" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "Skutečně chcete tuto stránku zavřít během zavádění systému?" @@ -5600,12 +5649,9 @@ msgid "Nutanix AHV" msgstr "Nutanix AHV" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "Správce virtuálních hostiteľů" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "Přidat {0}" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "Upravit správce virtuálních hostitelů" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5628,7 +5674,8 @@ msgstr "" "načteny." #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +#, fuzzy +msgid "{name} selected" msgstr "{0} vybráno" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6579,22 +6626,45 @@ msgstr "Zdroj nebyl nalezen." msgid "HTTP Error code " msgstr "Kód chyby HTTP " -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "foo" +#, fuzzy +#~ msgid "The action has been {0}." +#~ msgstr "Akce byla " -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "nedefinováno" +#~ msgid "Page" +#~ msgstr "Strana" + +#, fuzzy +#~ msgid "states" +#~ msgstr "Stát" + +#, fuzzy +#~ msgid "configuration channels" +#~ msgstr "Konfigurační kanály" + +#, fuzzy +#~ msgid "Search in {0}" +#~ msgstr "Vyhledávání" + +#~ msgid "({0} selected)" +#~ msgstr "(Vybráno: {0})" + +#~ msgid "_blank" +#~ msgstr "_prázdný" + +#~ msgid "Successfully bootstrapped host! Your system should appear in" +#~ msgstr "Hostitel byl úspěšně spuštěn! Váš systém by se měl objevit v" + +#~ msgid "systems" +#~ msgstr "systémy" + +#~ msgid "Virtual Host Manager" +#~ msgstr "Správce virtuálních hostiteľů" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "foo {0} čaj {1}" +#~ msgid "Add a {0}" +#~ msgstr "Přidat {0}" -#~ msgid "Search in configuration channels" -#~ msgstr "Hledat v konfiguračních kanálech" +#~ msgid "foo {0} tea {1}" +#~ msgstr "foo {0} čaj {1}" #~ msgid "Documentation" #~ msgstr "Dokumentace" diff --git a/web/po/de.po b/web/po/de.po index 415ac509e53c..3077e1ff5999 100644 --- a/web/po/de.po +++ b/web/po/de.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2022-01-11 14:51+0000\n" "Last-Translator: Michael Calmer \n" "Language-Team: German \n" @@ -45,33 +44,34 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "Pflichtfelder bitte ausfüllen: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -127,12 +127,16 @@ msgstr "" msgid "Next year" msgstr "Nächste" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " -msgstr "" +#, fuzzy +msgid "Are you sure you want to {action} {name}" +msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -141,9 +145,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -159,7 +163,8 @@ msgstr "Abbrechen" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -264,36 +269,25 @@ msgstr "" msgid "No flavor" msgstr "Keine Variante" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -303,19 +297,19 @@ msgstr "" msgid "Confirm" msgstr "Bestätigen" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -353,18 +347,12 @@ msgid "Last" msgstr "Letzte" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "Seite" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "von" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "Seite {0} von {1}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -464,7 +452,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -512,8 +500,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -528,8 +516,8 @@ msgid "Back" msgstr "Zurück" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "Änderungen speichern" @@ -541,23 +529,16 @@ msgstr "" msgid "Reorder" msgstr "Umsortieren" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Bundesland" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" -msgstr "" - #: ../html/src/components/states-picker.tsx:385 #, fuzzy -msgid "Search in {0}" +msgid "Search in states" msgstr "Suchen" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in configuration channels" +msgstr "" + +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -565,58 +546,47 @@ msgstr "Suchen" msgid "Search" msgstr "Suchen" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Bundesland" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" +msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "Es sind keine States zugewiesen." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Nachname" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Bundesland" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -632,7 +602,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "Zuweisen" @@ -657,7 +627,7 @@ msgid "Non-Virtual System" msgstr "System" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -686,21 +656,22 @@ msgstr "" msgid "Select a filter" msgstr "Alles auswählen" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" msgstr "({0} ausgewählt)" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Leeren" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "Alles auswählen" @@ -764,6 +735,19 @@ msgstr "keine" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -834,7 +818,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1017,7 +1001,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1042,6 +1026,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "von" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1068,7 +1058,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1082,7 +1072,7 @@ msgstr "" msgid "Edit " msgstr "Bearbeiten" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1093,13 +1083,13 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 #, fuzzy msgid "User" msgstr "Benutzer" @@ -1107,40 +1097,40 @@ msgstr "Benutzer" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Passwort" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1177,7 +1167,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1202,7 +1192,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1586,6 +1577,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1613,30 +1612,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2016,7 +2016,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2172,7 +2172,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2181,7 +2181,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2374,12 +2374,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2388,30 +2388,31 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" +msgstr "Projekt löschen" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2432,34 +2433,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2507,7 +2508,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2544,7 +2545,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2557,15 +2558,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2683,7 +2684,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2729,7 +2730,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2759,7 +2760,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2767,7 +2768,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2802,6 +2803,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2828,7 +2839,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2891,7 +2902,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2997,17 +3008,19 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" -msgstr "" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" +msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " #: ../html/src/manager/images/image-store-edit.tsx:165 msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3065,12 +3078,14 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" -msgstr "" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" +msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3187,8 +3202,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3384,7 +3399,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3420,11 +3435,13 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" -msgstr "" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" +msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3470,12 +3487,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3505,31 +3522,31 @@ msgstr "" msgid "Login" msgstr "Login" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3584,7 +3601,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3615,11 +3632,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3627,16 +3644,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3796,7 +3813,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3886,7 +3903,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3899,7 +3916,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3992,6 +4009,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Bundesland" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4296,7 +4322,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4486,7 +4512,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4570,8 +4596,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4671,7 +4697,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4755,7 +4781,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4799,14 +4825,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4905,113 +4931,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5424,11 +5444,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5450,8 +5466,9 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" -msgstr "" +#, fuzzy +msgid "{name} selected" +msgstr "({0} ausgewählt)" #: ../html/src/manager/virtualization/ListTab.tsx:242 msgid "Action Status" @@ -6385,19 +6402,12 @@ msgstr "" msgid "HTTP Error code " msgstr "" -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" +#~ msgid "Page" +#~ msgstr "Seite" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" +#, fuzzy +#~ msgid "states" +#~ msgstr "Bundesland" #, fuzzy #~ msgid "Documentation" @@ -6432,9 +6442,3 @@ msgstr "" #~ msgid "No flavors" #~ msgstr "Keine Varianten" - -#~ msgid "Delete project" -#~ msgstr "Projekt löschen" - -#~ msgid "Are you sure you want to delete project " -#~ msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " diff --git a/web/po/es.po b/web/po/es.po index 2e24ae9f2d8c..2a2ed7661b60 100644 --- a/web/po/es.po +++ b/web/po/es.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2020-09-01 09:07+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish \n" @@ -47,34 +46,35 @@ msgstr "" "Se ha guardado la fórmula. No es necesario aplicar el estado alto en esta " "fórmula." -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "Rellene los campos obligatorios: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 #, fuzzy msgid "Unnamed" msgstr "Nombre de usuario" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -130,13 +130,20 @@ msgstr "" msgid "Next year" msgstr "Siguiente" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " -msgstr "" +#, fuzzy +msgid "Are you sure you want to {action} {name}" +msgstr "¿Confirma que quiere eliminar la imagen" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +#, fuzzy +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" +"¿Confirma que quiere eliminar las imágenes seleccionadas? (se seleccionaron " +"{0})" #: ../html/src/components/dialog/DangerDialog.tsx:61 #: ../html/src/components/dialog/DangerDialog.tsx:62 @@ -144,9 +151,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -162,7 +169,8 @@ msgstr "Cancelar" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -268,38 +276,27 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "programado" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 #, fuzzy -msgid "The action has been {0}." +msgid "The action has been scheduled." msgstr "La acción se ha " -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 #, fuzzy msgid "Unable to clear selection" msgstr "Volver a la selección de sistema" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -309,20 +306,20 @@ msgstr "" msgid "Confirm" msgstr "Confirmar" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 #, fuzzy msgid "Filter by package name" msgstr "Filtrar por nombre de sistema" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -361,18 +358,12 @@ msgid "Last" msgstr "Apellido(s)" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "Página" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "de" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "Página {0} de {1}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -473,7 +464,8 @@ msgid "There are no entries to show." msgstr "No hay ninguna entrada que mostrar." #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "Canal de configuración: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -524,8 +516,8 @@ msgstr "" "asignar estados." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -540,8 +532,8 @@ msgid "Back" msgstr "Atrás" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "Guardar cambios" @@ -554,24 +546,16 @@ msgstr "Estado de acción" msgid "Reorder" msgstr "Reordenar" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Estado" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 +#: ../html/src/components/states-picker.tsx:385 #, fuzzy -msgid "configuration channels" -msgstr "Canales de configuración" +msgid "Search in states" +msgstr "Mostrar lista de sistemas" #: ../html/src/components/states-picker.tsx:385 -#, fuzzy -msgid "Search in {0}" -msgstr "Buscar" +msgid "Search in configuration channels" +msgstr "Buscar en canales de configuración" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -579,59 +563,51 @@ msgstr "Buscar" msgid "Search" msgstr "Buscar" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Estado" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "Estado de acción" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "Canal" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" +msgstr "Canales" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" -msgstr "" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "Arrastre los canales de configuración para editar su jerarquía." #: ../html/src/components/states-picker.tsx:405 #, fuzzy -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "Arrastre los canales de configuración para editar su jerarquía." -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "No hay ningún estado asignado." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Apellido(s)" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "Nombre del canal" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Canales de sóftwer" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "Etiqueta del canal" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -647,7 +623,7 @@ msgstr "Etiqueta del canal" msgid "Description" msgstr "Descripción" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "Asignar" @@ -673,7 +649,7 @@ msgid "Non-Virtual System" msgstr "Sistemas virtuales alojados" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -703,21 +679,22 @@ msgstr "Filtros" msgid "Select a filter" msgstr "Crear un filtro nuevo" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "Elementos {0} - {1} de {2}" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vaciar" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "Seleccionar todo" @@ -782,6 +759,19 @@ msgstr "(ninguno)" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -867,7 +857,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1055,7 +1045,7 @@ msgstr "Filtrar por cualquier valor" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1081,6 +1071,12 @@ msgstr "" msgid "never" msgstr "Gravedad" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "de" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1109,7 +1105,7 @@ msgstr "Se actualizaron las propiedades del proyecto correctamente" msgid "Edit Information" msgstr "Información adicional" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "Editando propiedades…" @@ -1124,7 +1120,7 @@ msgstr "Fecha de inicio" msgid "Edit " msgstr "Editar" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1135,13 +1131,13 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 #, fuzzy msgid "User" msgstr "Usuarios" @@ -1149,42 +1145,42 @@ msgstr "Usuarios" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Contraseña" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 #, fuzzy msgid "The instance you are looking for does not exist or has been deleted" msgstr "El proyecto que buscaba no existe o se ha eliminado" -#: ../html/src/manager/admin/payg/payg.tsx:67 +#: ../html/src/manager/admin/payg/payg.tsx:68 #, fuzzy -msgid "Instance Hostname: {0}" +msgid "Instance Hostname: {host}" msgstr "Detalles de ejemplar para «{0}»" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "¿Confirma que quiere eliminar el proyecto" @@ -1221,7 +1217,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1246,7 +1242,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1632,6 +1629,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "Canal" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1659,30 +1664,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2070,7 +2076,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2232,7 +2238,7 @@ msgid "Last Build" msgstr "Última modificación" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "Ciclo de vida de entorno" @@ -2241,8 +2247,9 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "El proyecto que buscaba no existe o se ha eliminado" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" -msgstr "" +#, fuzzy +msgid "Content Lifecycle Project - {name}" +msgstr "Proyectos de ciclo de vida de contenido" #: ../html/src/manager/content-management/project/project.tsx:116 msgid "Delete Project" @@ -2440,12 +2447,13 @@ msgstr "Activada" msgid "disable all modules" msgstr "Activada" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" +msgstr "Anfitrión de compilación" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2454,30 +2462,32 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" +msgstr "Anfitrión de compilación" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" -msgstr "" +#, fuzzy +msgid "Version {version} history" +msgstr "Histórico de versiones" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2498,34 +2508,35 @@ msgstr "Etiqueta" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" +msgstr "Se eliminó el filtro correctamente" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2573,8 +2584,9 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" -msgstr "" +#, fuzzy +msgid "Edit Filter {name}" +msgstr "Nombre del filtro" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 msgid "Filters" @@ -2610,7 +2622,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2623,15 +2635,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2753,7 +2765,7 @@ msgid "Page Not Found" msgstr "No se encontró la página" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2802,7 +2814,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2832,7 +2844,7 @@ msgstr "Sistemas" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2840,7 +2852,7 @@ msgstr "Paquetes" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2877,6 +2889,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "programado" + #: ../html/src/manager/images/image-build.tsx:241 #, fuzzy msgid "Profile Summary" @@ -2904,7 +2926,7 @@ msgstr "Ruta" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "Clave de activación" @@ -2968,7 +2990,7 @@ msgstr "Importar" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "Vaciar campos" @@ -3074,9 +3096,11 @@ msgstr "Eliminar perfiles seleccionados" msgid "Are you sure you want to delete the selected profile?" msgstr "¿Confirma que quiere eliminar el perfil seleccionado?" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" "¿Confirma que quiere eliminar los perfiles seleccionados? (se seleccionaron " "{0})" @@ -3086,7 +3110,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3144,12 +3168,16 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" +"¿Confirma que quiere eliminar los perfiles seleccionados? (se seleccionaron " +"{0})" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 #, fuzzy msgid "Build Log" msgstr "Anfitrión de compilación" @@ -3267,8 +3295,9 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "Detalles de ejemplar para «{0}»" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3465,7 +3494,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3501,13 +3530,15 @@ msgstr "Eliminar imágenes seleccionadas" msgid "Are you sure you want to delete the selected image?" msgstr "¿Confirma que quiere eliminar la imagen seleccionada?" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" "¿Confirma que quiere eliminar las imágenes seleccionadas? (se seleccionaron " "{0})" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Visión de conjunto" @@ -3553,12 +3584,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3588,33 +3619,33 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 #, fuzzy msgid "There are no more past maintenance windows" msgstr "No hay ningún estado asignado." -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 #, fuzzy msgid "There are no more future maintenance windows" msgstr "No hay ninguna entrada que mostrar." -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3671,7 +3702,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 #, fuzzy msgid "Assigned Systems" msgstr "Sistemas" @@ -3705,11 +3736,11 @@ msgstr "" msgid "Schedule Details" msgstr "Detalles del filtro" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3717,18 +3748,18 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 #, fuzzy msgid "Search systems" msgstr "Mostrar lista de sistemas" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 #, fuzzy msgid "Current Schedule" msgstr "Memoria actual" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3896,7 +3927,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3992,7 +4023,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -4005,8 +4036,9 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" -msgstr "" +#, fuzzy +msgid "Playbook '{name}'" +msgstr "Nombre del filtro" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 msgid "Schedule Playbook Execution" @@ -4102,6 +4134,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Estado" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4415,7 +4456,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4615,7 +4656,7 @@ msgstr "¿Confirma que quiere eliminar el perfil seleccionado?" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 #, fuzzy -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "Canal de estados de configuración" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4707,8 +4748,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4809,7 +4850,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4894,7 +4935,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4942,14 +4983,14 @@ msgid "System Group" msgstr "Grupo de sistemas" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 #, fuzzy msgid "Create Recurring" msgstr "Crear proyecto" @@ -5055,114 +5096,108 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "Ninguna" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 #, fuzzy msgid "Reactivation Key" msgstr "Clave de activación" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 #, fuzzy msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" @@ -5581,12 +5616,9 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "Editar gestores de anfitriones virtuales" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5607,8 +5639,9 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" -msgstr "" +#, fuzzy +msgid "{name} selected" +msgstr "Sistema bloqueado" #: ../html/src/manager/virtualization/ListTab.tsx:242 msgid "Action Status" @@ -6586,23 +6619,24 @@ msgstr "" msgid "HTTP Error code " msgstr "" -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" +#~ msgid "Page" +#~ msgstr "Página" -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" +#, fuzzy +#~ msgid "states" +#~ msgstr "Estado" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 #, fuzzy -msgid "foo {0} tea {1}" -msgstr "Página {0} de {1}" +#~ msgid "configuration channels" +#~ msgstr "Canales de configuración" -#~ msgid "Search in configuration channels" -#~ msgstr "Buscar en canales de configuración" +#, fuzzy +#~ msgid "Search in {0}" +#~ msgstr "Buscar" + +#, fuzzy +#~ msgid "foo {0} tea {1}" +#~ msgstr "Página {0} de {1}" #, fuzzy #~ msgid "Documentation" diff --git a/web/po/fr.po b/web/po/fr.po index 1b993cb03de5..e315f330e7ea 100644 --- a/web/po/fr.po +++ b/web/po/fr.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,33 +40,33 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +msgid "Please input required fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -122,12 +121,15 @@ msgstr "" msgid "Next year" msgstr "" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +msgid "Are you sure you want to {action} {name}" msgstr "" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -136,9 +138,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -154,7 +156,8 @@ msgstr "" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -259,36 +262,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -298,19 +290,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -348,18 +340,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -459,7 +444,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -507,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -523,8 +508,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -536,21 +521,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -558,56 +537,45 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -623,7 +591,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -645,7 +613,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -673,21 +641,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -751,6 +719,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -821,7 +802,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1004,7 +985,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1029,6 +1010,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1055,7 +1042,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1068,7 +1055,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1079,53 +1066,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1162,7 +1149,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1187,7 +1174,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1570,6 +1558,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1597,30 +1593,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2000,7 +1997,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2156,7 +2153,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2165,7 +2162,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2358,12 +2355,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2372,30 +2369,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2416,34 +2413,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2491,7 +2488,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2528,7 +2525,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2541,15 +2538,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2667,7 +2664,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2713,7 +2710,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2743,7 +2740,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2751,7 +2748,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2786,6 +2783,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2812,7 +2819,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2875,7 +2882,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2981,9 +2988,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2991,7 +2999,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3049,12 +3057,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3171,8 +3180,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3368,7 +3377,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3404,11 +3413,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3454,12 +3464,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3489,31 +3499,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3568,7 +3578,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3599,11 +3609,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3611,16 +3621,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3780,7 +3790,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3870,7 +3880,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3883,7 +3893,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3976,6 +3986,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4279,7 +4298,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4464,7 +4483,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4546,8 +4565,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4645,7 +4664,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4729,7 +4748,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4773,14 +4792,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4875,113 +4894,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5389,11 +5402,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5415,7 +5424,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6349,17 +6358,3 @@ msgstr "" #: ../html/src/utils/network.ts:105 msgid "HTTP Error code " msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" diff --git a/web/po/it.po b/web/po/it.po index 86ef717345d7..1cee627d4e16 100644 --- a/web/po/it.po +++ b/web/po/it.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-05-26 18:14+0000\n" "Last-Translator: Marina Latini \n" "Language-Team: Italian \n" @@ -47,15 +46,17 @@ msgstr "" "Formula salvata. L'applicazione dello stato alto non è necessaria per questa " "formula." -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "Inserisci i campi obbligatori: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +#, fuzzy +msgid "Invalid format of fields: {fields}" msgstr "Formato dei campi non valido: {0}" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -63,19 +64,19 @@ msgstr "" "In questa pagina è possibile configurare le Formule Salt per l'installazione " "e la configurazione automatica del software." -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "Espandi tutte le sezioni" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "Chiudi tutte le sezioni" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "Senza nome" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "Ricerca per nome del gruppo della formula" @@ -133,12 +134,16 @@ msgstr "Anno precedente" msgid "Next year" msgstr "Anno prossimo" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +#, fuzzy +msgid "Are you sure you want to {action} {name}" msgstr "Sei sicuro di voler {0} {1} " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -147,9 +152,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -165,7 +170,8 @@ msgstr "Annulla" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -275,36 +281,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -314,19 +309,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -364,18 +359,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -475,8 +463,9 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" -msgstr "" +#, fuzzy +msgid "Configuration Channel: {name}" +msgstr "Configurazione Canali" #: ../html/src/components/salt-state-popup.tsx:60 #: ../html/src/manager/images/image-profiles.tsx:204 @@ -523,8 +512,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -539,8 +528,8 @@ msgid "Back" msgstr "Indietro" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -552,22 +541,16 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Stato" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" -msgstr "" +#, fuzzy +msgid "Search in configuration channels" +msgstr "Configurazione Canali" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -575,58 +558,47 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Stato" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" +msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Stato" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Stato" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -642,7 +614,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -668,7 +640,7 @@ msgid "Non-Virtual System" msgstr "Gestore dell'host virtuale" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "Proxy" @@ -696,21 +668,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -774,6 +746,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -844,7 +829,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1027,7 +1012,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1052,6 +1037,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1078,7 +1069,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1091,7 +1082,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1102,53 +1093,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Password" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1185,7 +1176,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1210,7 +1201,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1594,6 +1586,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1621,30 +1621,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2024,7 +2025,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2181,7 +2182,7 @@ msgid "Last Build" msgstr "Crea" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2190,7 +2191,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2383,12 +2384,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2397,30 +2398,31 @@ msgstr "" msgid "Build" msgstr "Crea" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" +msgstr "Creazione" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2441,34 +2443,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2516,7 +2518,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2553,7 +2555,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2566,15 +2568,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2692,7 +2694,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2738,7 +2740,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2768,7 +2770,7 @@ msgstr "Sistemi" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2776,7 +2778,7 @@ msgstr "Pacchetti" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2811,6 +2813,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2837,7 +2849,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2900,7 +2912,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -3006,9 +3018,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -3016,7 +3029,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3074,12 +3087,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 #, fuzzy msgid "Build Log" msgstr "Crea" @@ -3197,8 +3211,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3394,7 +3408,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3430,11 +3444,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3480,12 +3495,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3515,31 +3530,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3594,7 +3609,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3625,11 +3640,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3637,16 +3652,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3806,7 +3821,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3896,7 +3911,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3909,7 +3924,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4003,6 +4018,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Stato" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4314,7 +4338,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4501,7 +4525,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4583,8 +4607,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4682,7 +4706,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4766,7 +4790,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4811,14 +4835,14 @@ msgid "System Group" msgstr "Sistema" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "Applica lo stato alto" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4919,113 +4943,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5438,13 +5456,10 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" msgstr "Gestore dell'host virtuale" -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "" - #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" msgstr "Gestori di host virtuali" @@ -5464,7 +5479,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6400,19 +6415,9 @@ msgstr "" msgid "HTTP Error code " msgstr "" -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" +#, fuzzy +#~ msgid "states" +#~ msgstr "Stato" #, fuzzy #~ msgid "Port range" diff --git a/web/po/ja.po b/web/po/ja.po index 36e6dbaa4a23..760d43e87b73 100644 --- a/web/po/ja.po +++ b/web/po/ja.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-06-27 04:15+0000\n" "Last-Translator: Carina Hagl \n" "Language-Team: Japanese \n" @@ -46,15 +45,17 @@ msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" "formula を保存しました。この formula に対する highstate の適用は不要です。" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "必須の項目に入力を行なってください: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +#, fuzzy +msgid "Invalid format of fields: {fields}" msgstr "項目の書式が正しくありません: {0}" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -62,19 +63,19 @@ msgstr "" "このページでは Salt Formula を設定して、ソフトウェアの自動インストールと設定" "を行なうことができます。" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "すべてのセクションを展開" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "すべてのセクションを折りたたむ" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "名前なし" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "数式のグループ名で検索" @@ -132,12 +133,17 @@ msgstr "前年" msgid "Next year" msgstr "来年" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +#, fuzzy +msgid "Are you sure you want to {action} {name}" msgstr "{1} を {0} してよろしいですか " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +#, fuzzy +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" "選択した {1} に対して {0} してよろしいですか？ ({2} 個の {1} が選択されていま" "す)" @@ -148,9 +154,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -166,7 +172,8 @@ msgstr "取り消し" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -275,36 +282,27 @@ msgstr "入力してください..." msgid "No flavor" msgstr "フレーバー無し" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +#, fuzzy +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "動作を動作チェーン「{0}」に追加しました 。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "スケジュールしました" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." -msgstr "動作は {0} でした。" +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +#, fuzzy +msgid "The action has been scheduled." +msgstr "イメージの取り込みをスケジュールしました。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "選択を解除できません" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "動作を実行できません。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -314,19 +312,19 @@ msgstr "動作を実行できません。" msgid "Confirm" msgstr "確認" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "一覧に戻る" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "パッケージ名でフィルタ" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -364,18 +362,12 @@ msgid "Last" msgstr "最後" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "ページ" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "／" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "{0} / {1} ページ" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -475,7 +467,8 @@ msgid "There are no entries to show." msgstr "表示すべき項目がありません。" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "設定チャンネル: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -525,8 +518,8 @@ msgstr "" "てください。" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -541,8 +534,8 @@ msgid "Back" msgstr "戻る" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "変更点の保存" @@ -554,21 +547,16 @@ msgstr "状態の実行" msgid "Reorder" msgstr "並べ替え" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "状態" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" -msgstr "設定チャンネル" +#: ../html/src/components/states-picker.tsx:385 +#, fuzzy +msgid "Search in states" +msgstr "システムの検索" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" -msgstr "{0} で検索" +msgid "Search in configuration channels" +msgstr "設定チャンネル内での検索" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -576,56 +564,49 @@ msgstr "{0} で検索" msgid "Search" msgstr "検索" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "都道府県" - -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "チャンネル" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "{0} ランクの編集" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" msgstr "{0} ランクの編集" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "{0} のランキングを編集するには、それらをドラッグしてください。" + #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +#, fuzzy +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "{0} のランキングを編集するには、それらをドラッグしてください。" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "状態が何も割り当てられていません。" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "状態名" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "チャンネル名" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "状態ラベル" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "チャンネルラベル" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -641,7 +622,7 @@ msgstr "チャンネルラベル" msgid "Description" msgstr "説明" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "割り当て" @@ -666,7 +647,7 @@ msgid "Non-Virtual System" msgstr "仮想システム" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "プロキシ" @@ -694,21 +675,23 @@ msgstr "フィルタ" msgid "Select a filter" msgstr "フィルタの選択" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "項目 {0} - {1} ／ {2}" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" -msgstr "({0} 個を選択しています)" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" +msgstr "削除を選択しました" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "消去" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "すべてを選択" @@ -772,6 +755,19 @@ msgstr "なし" msgid "Require this channel" msgstr "このチャンネルが必要" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "foo" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "未定義" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "変更した設定を反映させるには、再起動が必要です。" @@ -857,7 +853,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1040,7 +1036,7 @@ msgstr "任意の値でフィルタ" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "ホスト" @@ -1065,6 +1061,12 @@ msgstr "最終更新ステータス" msgid "never" msgstr "なし" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "／" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "従量課金制を追加" @@ -1093,7 +1095,7 @@ msgstr "従量課金制のプロパティが正常に更新されました" msgid "Edit Information" msgstr "情報を編集" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "プロパティを編集しています.." @@ -1106,7 +1108,7 @@ msgstr "最終ステータス更新" msgid "Edit " msgstr "編集 " -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "ssh接続データを編集しています.." @@ -1118,53 +1120,54 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "SSHポート" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "ユーザ" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "パスワード" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "SSH 機密鍵" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "SSH 機密鍵のパスフレーズ" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "お探しのインスタンスは存在していないか、削除されています" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +#, fuzzy +msgid "Instance Hostname: {host}" msgstr "インスタンスホスト名: {0}" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "従量課金制を削除" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "プロジェクトを削除してよろしいですか" @@ -1201,7 +1204,7 @@ msgstr "操作は成功しませんでした: サーバからの応答が空で #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "詳細" @@ -1228,8 +1231,10 @@ msgid "Selected channels were scheduled successfully for syncing." msgstr "選択されたチャンネルは同期のスケジュールに成功しました。" #: ../html/src/manager/admin/setup/products/products.tsx:270 +#, fuzzy msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" "「{0}」の次のチャンネルのインストールに失敗しました。ログファイルを確認してく" "ださい。" @@ -1627,6 +1632,14 @@ msgstr "再ビルド" msgid "Patch available but needs to be cloned into Channel." msgstr "パッチは利用可能ですが、チャンネルにクローンを作成する必要があります。" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "チャンネル" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "Errata" @@ -1656,33 +1669,36 @@ msgstr "利用可能なマッチングデータはありません。" msgid "You can also trigger a first run now by clicking the button below." msgstr "下記のボタンを押すことで、初回の起動を行なうことができます。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +#, fuzzy +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "マッチングデータは現在計算中です。 {0} に開始しています。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 +#, fuzzy msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" "直近のマッチングデータは {0} に計算されていますが、下記のボタンを押すことで新" "たに実行することもできます。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" "マッチングデータの計算は通常、夜間のタスクスケジュールとして実行されます ( " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "管理ページからタスクスケジュールを変更できます" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr ") 。 " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "マッチングデータの更新" @@ -2081,7 +2097,7 @@ msgstr "エポック" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2239,7 +2255,7 @@ msgid "Last Build" msgstr "前回のビルド" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "環境ライフサイクル" @@ -2248,7 +2264,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "お探しのプロジェクトは存在していないか、削除されています" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +#, fuzzy +msgid "Content Lifecycle Project - {name}" msgstr "コンテンツライフサイクルプロジェクト - {0}" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2445,12 +2462,13 @@ msgstr "モジュールの有効化" msgid "disable all modules" msgstr "すべてのモジュールの無効化" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" msgstr "ビルド ({0})" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2459,15 +2477,16 @@ msgstr "ビルド ({0})" msgid "Build" msgstr "ビルド" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "プロジェクトのビルド" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" msgstr "プロジェクトをビルドしています..." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." @@ -2475,16 +2494,18 @@ msgstr "" "このプロジェクトには同期されていないパッチを含むチャンネルがあります。これら" "の同期は、お使いの組織の設定に従って行なわれます。" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "バージョンメッセージ" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +#, fuzzy +msgid "Version {version} history" msgstr "バージョン {0} の履歴" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +#, fuzzy +msgid "Version {version} successfully built into {environmentName}" msgstr "バージョン {0} を {1} にビルドしました" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2505,34 +2526,36 @@ msgstr "ラベル" msgid "Insert before" msgstr "前に挿入" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "環境の追加" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "環境を作成しました" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "環境を作成しています..." -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "何も環境を作成していません" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "環境を更新しました" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" msgstr "環境 {0} を削除しました" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 +#, fuzzy msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" "この環境は {0}自動インストールディストリビューション{1} で使用されているた" "め、削除できません。" @@ -2582,7 +2605,8 @@ msgid "Create New Filter" msgstr "新しいフィルタの作成" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +#, fuzzy +msgid "Edit Filter {name}" msgstr "フィルタ {0} の編集" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2619,7 +2643,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "公開すべきバージョンや処理中の環境構築と衝突するバージョンはありません" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "公開" @@ -2632,15 +2656,17 @@ msgid "Target environment" msgstr "ターゲット環境" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +#, fuzzy +msgid "Promote version {version} into {environmentName}" msgstr "{1} 内にバージョン {0} を公開" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "環境の公開" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +#, fuzzy +msgid "Version {version} successfully promoted into {environmentName}" msgstr "{1} 内にバージョン {0} を公開しました" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2758,7 +2784,8 @@ msgid "Page Not Found" msgstr "ページが見つかりません" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +#, fuzzy +msgid "The page you requested, {currentUrl}, was not found." msgstr "リクエストされたページ {0} が見つかりませんでした。" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2816,7 +2843,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "Highstate" @@ -2846,7 +2873,7 @@ msgstr "システム" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2854,7 +2881,7 @@ msgstr "パッケージ" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2891,6 +2918,16 @@ msgstr "動作を動作チェーンに追加しました " msgid "Building the image has been " msgstr "イメージの構築を " +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "スケジュールしました" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "プロファイル概要" @@ -2917,7 +2954,7 @@ msgstr "パス" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "アクティベーションキー" @@ -2982,7 +3019,7 @@ msgstr "取り込み" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "項目の消去" @@ -3090,9 +3127,11 @@ msgstr "選択したプロファイルの削除" msgid "Are you sure you want to delete the selected profile?" msgstr "選択したプロファイルを削除してよろしいですか？" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" "選択したプロファイルを削除してよろしいですか？ ({0} 個のプロファイルが選択さ" "れています)" @@ -3102,7 +3141,7 @@ msgid "Use credentials" msgstr "資格情報の使用" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3162,13 +3201,15 @@ msgstr "選択したストアの削除" msgid "Are you sure you want to delete the selected store?" msgstr "選択したストアを削除してよろしいですか？" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" "選択したストアを削除してよろしいですか？ ({0} 個のストアが選択されています)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "構築ログ" @@ -3285,8 +3326,9 @@ msgid "Edit store" msgstr "ストアの編集" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "'{0}' に対するインスタンスの詳細" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3482,7 +3524,7 @@ msgid "Unknown" msgstr "不明" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "実行時間" @@ -3518,13 +3560,15 @@ msgstr "選択したイメージの削除" msgid "Are you sure you want to delete the selected image?" msgstr "選択したイメージを削除してよろしいですか？" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" "選択したイメージを削除してよろしいですか？ ({0} 個のイメージが選択されていま" "す)" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "概要" @@ -3583,12 +3627,12 @@ msgstr "" "Discover はサーバやパッケージ、パッチなどを 1 つのインターフェイスから管理で" "きる新しい方式です。" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" -msgstr "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." +msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3620,31 +3664,31 @@ msgstr "下記についてさらに詳しく" msgid "Login" msgstr "ログイン" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "直近のメンテナンスウィンドウまで飛ばす" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "次のメンテナンスウィンドウまで飛ばす" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "これより前のメンテナンスウィンドウはありません" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "これより先のメンテナンスウィンドウはありません" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "今日" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "月" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "日" @@ -3701,7 +3745,7 @@ msgid "Delete maintenance schedule" msgstr "メンテナンススケジュールの削除" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "割り当て済みのシステム" @@ -3732,11 +3776,12 @@ msgstr "マルチ" msgid "Schedule Details" msgstr "スケジュールの詳細" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +#, fuzzy +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "メンテナンススケジュールを {0} 個のシステムに割り当てました" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3744,16 +3789,17 @@ msgstr "メンテナンススケジュールを {0} 個のシステムに割り msgid "Cancel affected actions" msgstr "影響する動作のキャンセル" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "システムの検索" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "現在のスケジュール" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +#, fuzzy +msgid "Url '{url}' is invalid" msgstr "URL '{0}' が正しくありません" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3920,7 +3966,8 @@ msgid "Maintenance Schedules" msgstr "メンテナンススケジュール" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +#, fuzzy +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "メンテナンススケジュールを {0} 個のシステムに割り当てました" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -4015,7 +4062,7 @@ msgstr "playbook の内容を読み込んでいます.." #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "テストモード" @@ -4028,7 +4075,8 @@ msgid "Schedule playbook execution" msgstr "playbook の実行のスケジュール" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +#, fuzzy +msgid "Playbook '{name}'" msgstr "playbook '{0}'" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4121,6 +4169,15 @@ msgstr "削除済み" msgid "Package States" msgstr "パッケージの状態" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "都道府県" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "パッケージの状態を保存しました。" @@ -4436,7 +4493,7 @@ msgid "Proxy SSH port" msgstr "プロキシSSHポート" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "ポート範囲: 1 - 65535" @@ -4621,7 +4678,8 @@ msgid "Are you sure you want to delete this schedule?" msgstr "このスケジュールを削除してよろしいですか？" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +#, fuzzy +msgid "State configuration for {name}" msgstr "{0} の状態設定" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4706,9 +4764,10 @@ msgstr "" "い" #: ../html/src/manager/recurring/recurring-actions.tsx:148 +#, fuzzy msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" "サーバのタイムゾーン {0} には、以下の時間が表示されます。スケジュールされた時" "間はサーバ時間になります。" @@ -4808,7 +4867,8 @@ msgid "No minions matched the target expression." msgstr "ターゲット式に一致する minion はありません。" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +#, fuzzy +msgid "Server returned an error: {message}" msgstr "サーバはエラーを返しました: {0}" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4892,7 +4952,8 @@ msgid "Manager" msgstr "Manager" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +#, fuzzy +msgid "State Summary for {name}" msgstr "{0} の状態概要" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4936,14 +4997,15 @@ msgid "System Group" msgstr "システムグループ" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +#, fuzzy +msgid "Applying the highstate has been scheduled." msgstr "highstateの適用が次のようになりました: {0}。" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "highstate の適用" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "繰り返し作成" @@ -5050,46 +5112,39 @@ msgstr "" "リクエストが中断されたか、もしくはサーバから不正な応答を受け取りました。お使" "いの minion が正しくブートストラップされているかどうかをご確認ください。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" -"ホストをブートストラップしました。システムはまもなくシステム内に表示されます" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "　" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 +#, fuzzy msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "トランザクションシステムの場合は、再起動して登録を完了してください" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "このエラーの詳細を表示する" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "ホストをブートストラップできません。 次のエラーが発生しました。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "システムをブートストラップしています: 応答を待っています.." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "SSH 機密鍵を読み込んでいます.." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "ブートストラップ" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "例: ••••••••••••" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" @@ -5097,61 +5152,64 @@ msgstr "" "ファイルはサーバ内の一時ファイルとして保存されています。ブートストラップ処理" "が完了すると削除されます" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "パスフレーズが無い場合は何も入力しないでください" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "minion のブートストラップ" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 +#, fuzzy msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" "SSH の資格情報のみを提供することで、管理対象のシステムを追加することができま" "す。 {0} はシステムを遠隔から準備し、登録処理を実施します。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "例: host.domain.com" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 +#, fuzzy msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" "ユーザはブートストラップ処理の際にのみ有効化されます。それ以降の接続に対して" "は、 rhn.conf 内で指定したユーザで行ないます。また、 'ssh_push_sudo_user' の" "鍵に対する既定のユーザは 'root' です。このユーザは {0} の SSH 鍵を配置したあ" "と、ブートストラップ処理の際に設定されます。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "認証メソッド" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "Ansible 制御ノード" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "なし" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "再アクティベーションキー" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "再アクティベーションが不要な場合は空のままにする" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." @@ -5159,15 +5217,15 @@ msgstr "" "プロキシのホスト名が完全修飾型ではありません。チャンネルへのアクセス時に問題" "を引き起こす可能性があります。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "ブートストラッププロセス中にSSH厳密ホストキーの確認を無効にする" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "SSH 経由でシステムを完全に管理する(エージェントをインストールしない)" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "ブートストラップ中にこのページを閉じてもよろしいですか?" @@ -5605,12 +5663,9 @@ msgid "Nutanix AHV" msgstr "Nutanix AHV" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "仮想ホストマネージャ" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "{0} を追加" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "仮想ホストマネージャの編集" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5633,7 +5688,8 @@ msgstr "" "がロードされていることを確認してください。" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +#, fuzzy +msgid "{name} selected" msgstr "{0} 個を選択しました" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6585,22 +6641,43 @@ msgstr "リソースが見つかりませんでした。" msgid "HTTP Error code " msgstr "HTTP エラーコード " -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "foo" +#~ msgid "The action has been {0}." +#~ msgstr "動作は {0} でした。" -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "未定義" +#~ msgid "Page" +#~ msgstr "ページ" + +#~ msgid "states" +#~ msgstr "状態" + +#~ msgid "configuration channels" +#~ msgstr "設定チャンネル" + +#~ msgid "Search in {0}" +#~ msgstr "{0} で検索" + +#~ msgid "({0} selected)" +#~ msgstr "({0} 個を選択しています)" + +#~ msgid "_blank" +#~ msgstr "_blank" + +#~ msgid "Successfully bootstrapped host! Your system should appear in" +#~ msgstr "" +#~ "ホストをブートストラップしました。システムはまもなくシステム内に表示されま" +#~ "す" + +#~ msgid "systems" +#~ msgstr "　" + +#~ msgid "Virtual Host Manager" +#~ msgstr "仮想ホストマネージャ" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "foo {0} tea {1}" +#~ msgid "Add a {0}" +#~ msgstr "{0} を追加" -#~ msgid "Search in configuration channels" -#~ msgstr "設定チャンネル内での検索" +#~ msgid "foo {0} tea {1}" +#~ msgstr "foo {0} tea {1}" #~ msgid "Documentation" #~ msgstr "ドキュメンテーション" diff --git a/web/po/ko.po b/web/po/ko.po index 892f21ba2653..8392899f4f51 100644 --- a/web/po/ko.po +++ b/web/po/ko.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-06-27 07:37+0000\n" "Last-Translator: Seeun Lee \n" "Language-Team: Korean \n" @@ -45,15 +44,17 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "수식이 저장되었습니다. 이 수식에는 highstate를 적용할 필요가 없습니다." -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "필수 필드 입력: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +#, fuzzy +msgid "Invalid format of fields: {fields}" msgstr "잘못된 필드 유형: {0}" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -61,19 +62,19 @@ msgstr "" "이 페이지에서 소프트웨어를 자동으로 설치 및 구성할 Salt 수식을 구성할 수 있습" "니다." -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "전체 섹션 확장" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "전체 섹션 축소" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "이름 없음" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "수식 그룹 이름을 기준으로 검색" @@ -131,12 +132,17 @@ msgstr "전년도" msgid "Next year" msgstr "내년" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +#, fuzzy +msgid "Are you sure you want to {action} {name}" msgstr "{0} {1}을(를) 수행하시겠습니까 " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +#, fuzzy +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "선택한 {1}을(를) {0}하시겠습니까?({2} {1} 선택됨)" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -145,9 +151,9 @@ msgstr "선택한 {1}을(를) {0}하시겠습니까?({2} {1} 선택됨)" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -163,7 +169,8 @@ msgstr "취소" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -271,36 +278,27 @@ msgstr "입력 시작..." msgid "No flavor" msgstr "특징 없음" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +#, fuzzy +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "작업이 작업 체인 '{0}'에 추가되었습니다." -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "예약됨" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." -msgstr "작업이 {0}되었습니다." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +#, fuzzy +msgid "The action has been scheduled." +msgstr "이미지 가져오기가 예약되었습니다." -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "선택을 취소할 수 없음" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "작업을 수행할 수 없습니다." -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -310,19 +308,19 @@ msgstr "작업을 수행할 수 없습니다." msgid "Confirm" msgstr "확인" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "목록으로 돌아가기" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "패키지 이름을 기준으로 필터링" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -360,18 +358,12 @@ msgid "Last" msgstr "성" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "페이지" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "/" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "{0} / {1}페이지" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -471,7 +463,8 @@ msgid "There are no entries to show." msgstr "표시할 항목이 없습니다." #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "구성 채널: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -519,8 +512,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "상태가 지정되지 않았습니다. 검색을 사용하여 상태를 찾아 지정하십시오." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -535,8 +528,8 @@ msgid "Back" msgstr "뒤로" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "변경사항 저장" @@ -548,21 +541,16 @@ msgstr "실행 상태" msgid "Reorder" msgstr "다시 정렬" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "상태" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" -msgstr "구성 채널" +#: ../html/src/components/states-picker.tsx:385 +#, fuzzy +msgid "Search in states" +msgstr "검색 시스템" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" -msgstr "{0}에서 검색" +msgid "Search in configuration channels" +msgstr "구성 채널에서 검색" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -570,56 +558,49 @@ msgstr "{0}에서 검색" msgid "Search" msgstr "검색" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "시/도" - -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "채널" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "{0} 순위 편집" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" msgstr "{0} 순위 편집" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "드래그하여 {0}의 순위를 편집합니다." + #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +#, fuzzy +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "드래그하여 {0}의 순위를 편집합니다." -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "상태가 지정되지 않았습니다." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "상태 이름" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "채널 이름" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "상태 레이블" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "채널 레이블" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -635,7 +616,7 @@ msgstr "채널 레이블" msgid "Description" msgstr "설명" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "할당" @@ -660,7 +641,7 @@ msgid "Non-Virtual System" msgstr "가상 시스템" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "프록시" @@ -688,21 +669,23 @@ msgstr "필터" msgid "Select a filter" msgstr "필터 선택" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "항목 {0} - {1} / {2}" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" -msgstr "({0}개 선택됨)" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" +msgstr "선택 항목 삭제" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "지우기" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "모두 선택" @@ -766,6 +749,19 @@ msgstr "없음" msgid "Require this channel" msgstr "이 채널 필요" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "푸" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "정의되지 않음" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "구성 변경 사항을 적용하려면 다시 시작해야 합니다." @@ -852,7 +848,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1035,7 +1031,7 @@ msgstr "값을 기준으로 필터링" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "호스트" @@ -1060,6 +1056,12 @@ msgstr "최신 업데이트 상태" msgid "never" msgstr "안 함" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "/" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "용량제 추가" @@ -1088,7 +1090,7 @@ msgstr "용량제 속성 업데이트됨" msgid "Edit Information" msgstr "정보 편집" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "속성을 편집하는 중..." @@ -1101,7 +1103,7 @@ msgstr "최신 상태 업데이트" msgid "Edit " msgstr "편집 " -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "SSH 연결 데이터 편집 중..." @@ -1112,53 +1114,54 @@ msgstr "SSH 연결을 편집할 때 필요한 모든 인증서를 다시 제공 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "SSH 포트" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "사용자" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "비밀번호" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "SSH 개인 키" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "SSH 개인 키 비밀번호" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "찾고 있는 인스턴스가 없거나 삭제되었습니다." -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +#, fuzzy +msgid "Instance Hostname: {host}" msgstr "인스턴스 호스트 이름: {0}" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "용량제 삭제" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "프로젝트를 삭제하시겠습니까" @@ -1195,7 +1198,7 @@ msgstr "작업 실패: 서버에서 빈 회신" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "세부 사항" @@ -1221,8 +1224,10 @@ msgid "Selected channels were scheduled successfully for syncing." msgstr "선택한 채널의 동기화가 예정되었습니다." #: ../html/src/manager/admin/setup/products/products.tsx:270 +#, fuzzy msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "'{0}'에 대한 다음 채널 설치에 실패했습니다. 로그 파일을 확인하십시오." #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1614,6 +1619,14 @@ msgstr "다시 빌드" msgid "Patch available but needs to be cloned into Channel." msgstr "사용 가능한 패치지만 채널로 복제해야 합니다." +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "채널" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "Errata" @@ -1643,33 +1656,36 @@ msgstr "현재 일치 데이터를 사용할 수 없습니다." msgid "You can also trigger a first run now by clicking the button below." msgstr "아래 버튼을 클릭하여 첫 번째 실행을 트리거할 수도 있습니다." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +#, fuzzy +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" "현재 일치 데이터를 다시 계산하는 중입니다. 이 작업은 {0}에 시작되었습니다." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 +#, fuzzy msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" "마지막 일치 데이터는 {0}에 계산되었으며, 이제 아래 버튼을 클릭하여 새 실행을 " "트리거할 수 있습니다." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "일치 데이터는 작업 일정을 통해 계산되며, 기본값은 야간(사용자는 " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "관리 페이지에서 작업 일정을 변경할 수 있음" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "입니다). " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "일치 데이터 새로 고침" @@ -2060,7 +2076,7 @@ msgstr "에포크" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2216,7 +2232,7 @@ msgid "Last Build" msgstr "마지막 빌드" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "환경 라이프싸이클" @@ -2225,7 +2241,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "찾고 있는 프로젝트가 없거나 삭제되었습니다." #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +#, fuzzy +msgid "Content Lifecycle Project - {name}" msgstr "컨텐트 라이프싸이클 프로젝트 - {0}" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2418,12 +2435,13 @@ msgstr "모듈 활성화" msgid "disable all modules" msgstr "모든 모듈 비활성화" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" msgstr "빌드({0})" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2432,15 +2450,16 @@ msgstr "빌드({0})" msgid "Build" msgstr "빌드" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "프로젝트 빌드" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" msgstr "프로젝트를 빌드하는 중..." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." @@ -2448,16 +2467,18 @@ msgstr "" "프로젝트에 동기화되지 않은 패치가 있는 채널이 포함되어 있습니다. 그러한 채널" "은 조직 설정에 따라 동기화됩니다." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "버전 메시지" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +#, fuzzy +msgid "Version {version} history" msgstr "버전 {0} 기록" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +#, fuzzy +msgid "Version {version} successfully built into {environmentName}" msgstr "{0} 버전이 {1}(으)로 빌드됨" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2478,34 +2499,36 @@ msgstr "레이블" msgid "Insert before" msgstr "다음 앞에 삽입" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "환경 추가" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "환경 생성됨" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "환경을 생성하는 중..." -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "환경이 생성되지 않음" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "환경 업데이트됨" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" msgstr "{0} 환경 삭제됨" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 +#, fuzzy msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "이 환경은 {0}자동 설치 배포{1}에서 사용 중이므로 삭제할 수 없습니다." #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2553,7 +2576,8 @@ msgid "Create New Filter" msgstr "새 필터 만들기" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +#, fuzzy +msgid "Edit Filter {name}" msgstr "{0} 필터 편집" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2590,7 +2614,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "진행 중인 환경 빌드를 승격하거나 충돌하는 버전 없음" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "승격" @@ -2603,15 +2627,17 @@ msgid "Target environment" msgstr "대상 환경" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +#, fuzzy +msgid "Promote version {version} into {environmentName}" msgstr "버전을 {0}에서 {1}(으)로 승격" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "환경 승격" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +#, fuzzy +msgid "Version {version} successfully promoted into {environmentName}" msgstr "{0} 버전이 {0}(으)로 승격됨" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2729,7 +2755,8 @@ msgid "Page Not Found" msgstr "페이지를 찾을 수 없음" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +#, fuzzy +msgid "The page you requested, {currentUrl}, was not found." msgstr "요청한 페이지 {0}을(를) 찾을 수 없습니다." #: ../html/src/manager/errors/not-found.tsx:12 @@ -2784,7 +2811,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "Highstate" @@ -2814,7 +2841,7 @@ msgstr "시스템" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2822,7 +2849,7 @@ msgstr "패키지" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2859,6 +2886,16 @@ msgstr "작업이 작업 체인에 추가되었습니다. " msgid "Building the image has been " msgstr "이미지 빌드가 " +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "예약됨" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "프로파일 요약" @@ -2885,7 +2922,7 @@ msgstr "경로" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "활성화 키" @@ -2948,7 +2985,7 @@ msgstr "가져오기" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "필드 지우기" @@ -3054,9 +3091,11 @@ msgstr "선택한 프로파일 삭제" msgid "Are you sure you want to delete the selected profile?" msgstr "선택한 프로파일을 삭제하시겠습니까?" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "선택한 프로파일을 삭제하시겠습니까?({0}개 프로파일 선택됨)" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -3064,7 +3103,7 @@ msgid "Use credentials" msgstr "자격 증명 사용" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3122,12 +3161,14 @@ msgstr "선택한 저장소 삭제" msgid "Are you sure you want to delete the selected store?" msgstr "선택한 저장소를 삭제하시겠습니까?" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "선택한 저장소를 삭제하시겠습니까?({0}개 저장소 선택됨)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "로그 빌드" @@ -3244,8 +3285,9 @@ msgid "Edit store" msgstr "저장소 편집" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "'{0}'용 인스턴스 세부 사항" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3441,7 +3483,7 @@ msgid "Unknown" msgstr "알 수 없음" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "런타임" @@ -3477,11 +3519,13 @@ msgstr "선택한 이미지 삭제" msgid "Are you sure you want to delete the selected image?" msgstr "선택한 이미지를 삭제하시겠습니까?" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "선택한 이미지를 삭제하시겠습니까?({0}개 이미지 선택됨)" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "개요" @@ -3539,12 +3583,12 @@ msgstr "" "서버, 패키지, 패치 등을 단일 인터페이스에서 관리하기 위한 새로운 방법을 알아" "보십시오." -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" -msgstr "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." +msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3576,31 +3620,31 @@ msgstr "자세히 알아보기" msgid "Login" msgstr "로그인" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "마지막 유지보수 기간으로 건너뛰기" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "마지막 유지보수 기간으로 건너뛰기" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "마지막 유지보수 기간이 더 이상 없음" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "더 이상 향후 유지보수 기간이 없음" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "오늘" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "월" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "일" @@ -3655,7 +3699,7 @@ msgid "Delete maintenance schedule" msgstr "유지보수 일정 삭제" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "할당된 시스템" @@ -3686,11 +3730,12 @@ msgstr "다중" msgid "Schedule Details" msgstr "일정 세부 사항" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +#, fuzzy +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "유지보수 일정이 {0}개 시스템에 할당되었습니다." -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3698,16 +3743,17 @@ msgstr "유지보수 일정이 {0}개 시스템에 할당되었습니다." msgid "Cancel affected actions" msgstr "영향을 받는 작업 취소" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "검색 시스템" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "현재 일정" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +#, fuzzy +msgid "Url '{url}' is invalid" msgstr "'{0}' URL이 잘못됨" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3869,7 +3915,8 @@ msgid "Maintenance Schedules" msgstr "유지보수 일정" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +#, fuzzy +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "유지보수 일정을 {0}개 시스템에 할당" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3961,7 +4008,7 @@ msgstr "플레이북 컨텐츠를 로드하는 중..." #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "테스트 모드" @@ -3974,7 +4021,8 @@ msgid "Schedule playbook execution" msgstr "플레이북 실행 예약" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +#, fuzzy +msgid "Playbook '{name}'" msgstr "'{0}' 플레이북" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4067,6 +4115,15 @@ msgstr "제거됨" msgid "Package States" msgstr "패키지 상태" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "시/도" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "패키지 상태가 저장되었습니다." @@ -4377,7 +4434,7 @@ msgid "Proxy SSH port" msgstr "프록시 SSH 포트" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "포트 범위: 1 - 65535" @@ -4562,7 +4619,8 @@ msgid "Are you sure you want to delete this schedule?" msgstr "이 일정을 삭제하시겠습니까?" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +#, fuzzy +msgid "State configuration for {name}" msgstr "{0}에 대한 상태 구성" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4647,9 +4705,10 @@ msgstr "" "오." #: ../html/src/manager/recurring/recurring-actions.tsx:148 +#, fuzzy msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" "아래 시간은 서버 시간대 {0}에 표시됩니다. 예약된 시간은 서버 시간이 됩니다." @@ -4748,7 +4807,8 @@ msgid "No minions matched the target expression." msgstr "대상 식과 일치하는 minion이 없습니다." #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +#, fuzzy +msgid "Server returned an error: {message}" msgstr "서버에서 오류가 반환됨: {0}" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4832,7 +4892,8 @@ msgid "Manager" msgstr "Manager" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +#, fuzzy +msgid "State Summary for {name}" msgstr "{0}에 대한 상태 요약" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4876,14 +4937,15 @@ msgid "System Group" msgstr "시스템 그룹" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +#, fuzzy +msgid "Applying the highstate has been scheduled." msgstr "highstate 적용이 {0}되었습니다." -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "Highstate 적용" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "반복 생성" @@ -4989,105 +5051,102 @@ msgstr "" "서버로부터 수신된 중단되거나 유효하지 않은 응답을 요청하십시오. minion이 올바" "르게 부트스트랩되었는지 확인하십시오." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "호스트를 부트스트랩했습니다! 시스템이 표시되어야 하는 위치:" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "시스템" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 +#, fuzzy msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "잠시 후에. 트랜잭션 시스템인 경우 재부팅하여 등록을 완료하십시오." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "이 오류에 대한 추가 세부 정보 보기" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "호스트 부트스트랩에 실패했습니다. 다음 오류가 발생했습니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "시스템을 부트스트랩하는 중: 응답을 기다리는 중..." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "SSH 개인 키를 로드하는 중..." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "부트스트랩" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "예: ••••••••••••" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "파일이 서버의 임시 파일에 저장되고 부트스트랩 절차 후에 삭제됩니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "비밀번호가 없는 경우 비워둡니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "부트스트랩 Minion" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 +#, fuzzy msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" "SSH 인증서만을 제공하여 관리할 시스템을 추가할 수 있습니다. {0}은(는) 시스템" "을 원격으로 준비하며 등록을 수행합니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "예: host.domain.com" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 +#, fuzzy msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" "사용자는 부트스트랩 프로세스 중에만 영향을 미칩니다. 추가 연결은 rhn.conf에 " "지정된 사용자에 의해 수행됩니다. 'ssh_push_sudo_user' 키의 기본 사용자는 " "'root'입니다. 이 사용자는 부트스트랩 절차 중에 {0}의 SSH 키가 배포된 후에 설" "정됩니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "인증 방법" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "Ansible 제어 노드" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "없음" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "활성화 키" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "재활성화를 원하지 않는 경우 비워둡니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." @@ -5095,15 +5154,15 @@ msgstr "" "프록시의 호스트 이름이 완전하지 않습니다. 이로 인해 채널에 액세스할 때 문제" "가 발생할 수 있습니다." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "부트스트랩 프로세스 중 SSH strict 호스트 키 확인 비활성화" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "SSH를 통해 시스템을 완전히 관리합니다(에이전트를 설치하지 않음)." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "부트스트랩을 진행하는 동안 이 페이지를 닫으시겠습니까?" @@ -5527,12 +5586,9 @@ msgid "Nutanix AHV" msgstr "Nutanix AHV" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "가상 호스트 관리자" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "{0}에 추가" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "가상 호스트 관리자 편집" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5555,7 +5611,8 @@ msgstr "" "인하십시오." #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +#, fuzzy +msgid "{name} selected" msgstr "{0}개 선택됨" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6494,22 +6551,41 @@ msgstr "리소스를 찾을 수 없음" msgid "HTTP Error code " msgstr "HTTP 오류 코드 " -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "푸" +#~ msgid "The action has been {0}." +#~ msgstr "작업이 {0}되었습니다." -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "정의되지 않음" +#~ msgid "Page" +#~ msgstr "페이지" + +#~ msgid "states" +#~ msgstr "상태" + +#~ msgid "configuration channels" +#~ msgstr "구성 채널" + +#~ msgid "Search in {0}" +#~ msgstr "{0}에서 검색" + +#~ msgid "({0} selected)" +#~ msgstr "({0}개 선택됨)" + +#~ msgid "_blank" +#~ msgstr "_blank" + +#~ msgid "Successfully bootstrapped host! Your system should appear in" +#~ msgstr "호스트를 부트스트랩했습니다! 시스템이 표시되어야 하는 위치:" + +#~ msgid "systems" +#~ msgstr "시스템" + +#~ msgid "Virtual Host Manager" +#~ msgstr "가상 호스트 관리자" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "푸 {0} 티 {1}" +#~ msgid "Add a {0}" +#~ msgstr "{0}에 추가" -#~ msgid "Search in configuration channels" -#~ msgstr "구성 채널에서 검색" +#~ msgid "foo {0} tea {1}" +#~ msgstr "푸 {0} 티 {1}" #~ msgid "Documentation" #~ msgstr "문서" diff --git a/web/po/pt.po b/web/po/pt.po index 2b821ee199c4..5cbe6b5eb332 100644 --- a/web/po/pt.po +++ b/web/po/pt.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2021-10-15 12:11+0000\n" "Last-Translator: Ricardo Mateus \n" "Language-Team: Portuguese '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -301,19 +293,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -351,18 +343,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -462,7 +447,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -510,8 +495,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -526,8 +511,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -539,22 +524,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Estado" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -562,58 +540,47 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Estado" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" +msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Estado" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Estado" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -629,7 +596,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -651,7 +618,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -679,21 +646,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -757,6 +724,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -827,7 +807,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1010,7 +990,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1035,6 +1015,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1061,7 +1047,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1074,7 +1060,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1085,53 +1071,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1168,7 +1154,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1193,7 +1179,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1576,6 +1563,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1603,30 +1598,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2006,7 +2002,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2162,7 +2158,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2171,7 +2167,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2364,12 +2360,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2378,30 +2374,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2422,34 +2418,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2497,7 +2493,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2534,7 +2530,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2547,15 +2543,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2673,7 +2669,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2719,7 +2715,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2749,7 +2745,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2757,7 +2753,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2792,6 +2788,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2818,7 +2824,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2881,7 +2887,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2987,9 +2993,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2997,7 +3004,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3055,12 +3062,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3177,8 +3185,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3374,7 +3382,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3410,11 +3418,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3460,12 +3469,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3495,31 +3504,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3574,7 +3583,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3605,11 +3614,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3617,16 +3626,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3786,7 +3795,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3876,7 +3885,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3889,7 +3898,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3982,6 +3991,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Estado" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4285,7 +4303,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4471,7 +4489,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4553,8 +4571,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4652,7 +4670,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4736,7 +4754,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4780,14 +4798,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4882,113 +4900,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5396,11 +5408,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5422,7 +5430,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6357,16 +6365,6 @@ msgstr "" msgid "HTTP Error code " msgstr "" -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" +#, fuzzy +#~ msgid "states" +#~ msgstr "Estado" diff --git a/web/po/pt_BR.po b/web/po/pt_BR.po index fc051d4bfc22..adafe85d58dd 100644 --- a/web/po/pt_BR.po +++ b/web/po/pt_BR.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2021-03-07 04:47+0000\n" "Last-Translator: Rodrigo Macedo \n" "Language-Team: Portuguese (Brazil) '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 #, fuzzy -msgid "The action has been {0}." +msgid "The action has been scheduled." msgstr "Cadeia de novas ações" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 #, fuzzy msgid "Unable to clear selection" msgstr "Selecionar uma agenda" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -319,19 +315,19 @@ msgstr "" msgid "Confirm" msgstr "Confirmar" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -370,18 +366,12 @@ msgid "Last" msgstr "Sobrenome" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "Página" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "de" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "Página {0} de {1}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -483,7 +473,8 @@ msgid "There are no entries to show." msgstr "Não há entradas para mostrar." #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "Canal de configuração: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -533,8 +524,8 @@ msgstr "" "Nenhum estado atribuído. Use a pesquisa para localizar e atribuir estados." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -549,8 +540,8 @@ msgid "Back" msgstr "Voltar" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "Salvar Mudanças" @@ -562,24 +553,16 @@ msgstr "" msgid "Reorder" msgstr "Reordenar" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "states" -msgstr "Estado" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -#, fuzzy -msgid "configuration channels" -msgstr "Canais de Configuração" - #: ../html/src/components/states-picker.tsx:385 #, fuzzy -msgid "Search in {0}" +msgid "Search in states" msgstr "Buscar" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in configuration channels" +msgstr "Pesquisar canais de configuração" + +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -587,59 +570,50 @@ msgstr "Buscar" msgid "Search" msgstr "Buscar" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Estado" - -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" -msgstr "" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" +msgstr "Nome do Canal" + +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "Edite a classificação dos canais de configuração arrastando-os." #: ../html/src/components/states-picker.tsx:405 #, fuzzy -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "Edite a classificação dos canais de configuração arrastando-os." -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "Não há estados atribuídos." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 #, fuzzy msgid "State Name" msgstr "Sobrenome" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "Nome do Canal" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 #, fuzzy msgid "State Label" msgstr "Canal de configuração de estado" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "Referência do Canal" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -655,7 +629,7 @@ msgstr "Referência do Canal" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "Assinar" @@ -680,7 +654,7 @@ msgid "Non-Virtual System" msgstr "Sistemas" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -709,21 +683,21 @@ msgstr "" msgid "Select a filter" msgstr "Selecionar uma agenda" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -787,6 +761,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -857,7 +844,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1040,7 +1027,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1065,6 +1052,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "de" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1092,7 +1085,7 @@ msgstr "" msgid "Edit Information" msgstr "Editar Canal de Configuração" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1106,7 +1099,7 @@ msgstr "" msgid "Edit " msgstr "Editar" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1117,13 +1110,13 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 #, fuzzy msgid "User" msgstr "Usuários" @@ -1131,40 +1124,40 @@ msgstr "Usuários" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Senha" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1201,7 +1194,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1226,7 +1219,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1609,6 +1603,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1636,30 +1638,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2040,7 +2043,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2198,7 +2201,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2207,7 +2210,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2400,12 +2403,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2414,30 +2417,31 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." -msgstr "" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" +msgstr "Remover projeto" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2458,34 +2462,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2533,7 +2537,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2570,7 +2574,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2583,15 +2587,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2710,7 +2714,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2756,7 +2760,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2786,7 +2790,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2794,7 +2798,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2829,6 +2833,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2855,7 +2869,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2918,7 +2932,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -3024,17 +3038,20 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" +"Tem certeza de que deseja {0} os {1}s selecionados? ({2} {1}s selecionados)" #: ../html/src/manager/images/image-store-edit.tsx:165 msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3092,12 +3109,15 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" +"Tem certeza de que deseja {0} os {1}s selecionados? ({2} {1}s selecionados)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3214,8 +3234,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3411,7 +3431,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3447,11 +3467,14 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" +"Tem certeza de que deseja {0} os {1}s selecionados? ({2} {1}s selecionados)" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3497,12 +3520,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3532,36 +3555,36 @@ msgstr "" msgid "Login" msgstr "Acesso" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 #, fuzzy msgid "Skip to the last maintenance window" msgstr "Sem janelas de manutenção futuras" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 #, fuzzy msgid "Skip to the next maintenance window" msgstr "Sem janelas de manutenção futuras" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 #, fuzzy msgid "There are no more past maintenance windows" msgstr "Sem janelas de manutenção futuras" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 #, fuzzy msgid "There are no more future maintenance windows" msgstr "Sem janelas de manutenção futuras" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 #, fuzzy msgid "Month" msgstr "Mensal:" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 #, fuzzy msgid "Day" msgstr "Diariamente:" @@ -3617,7 +3640,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3648,11 +3671,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3660,16 +3683,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3830,7 +3853,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3920,7 +3943,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3933,7 +3956,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4028,6 +4051,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Estado" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4335,7 +4367,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4525,7 +4557,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 #, fuzzy -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "Canal de configuração de estado" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4609,8 +4641,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4711,7 +4743,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4795,7 +4827,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4842,14 +4874,14 @@ msgid "System Group" msgstr "Sistemas" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4951,113 +4983,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5469,11 +5495,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5495,7 +5517,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6434,23 +6456,20 @@ msgstr "" msgid "HTTP Error code " msgstr "" -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" +#~ msgid "Page" +#~ msgstr "Página" -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" +#, fuzzy +#~ msgid "states" +#~ msgstr "Estado" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 #, fuzzy -msgid "foo {0} tea {1}" -msgstr "Página {0} de {1}" +#~ msgid "configuration channels" +#~ msgstr "Canais de Configuração" -#~ msgid "Search in configuration channels" -#~ msgstr "Pesquisar canais de configuração" +#, fuzzy +#~ msgid "foo {0} tea {1}" +#~ msgstr "Página {0} de {1}" #~ msgid "Time" #~ msgstr "Hora" @@ -6485,9 +6504,6 @@ msgstr "Página {0} de {1}" #~ msgid "No flavors" #~ msgstr "Sem sabores" -#~ msgid "Delete project" -#~ msgstr "Remover projeto" - #~ msgid "Are you sure you want to delete project " #~ msgstr "Tem certeza que deseja excluir o projeto " diff --git a/web/po/si.po b/web/po/si.po index f51e2f23d07e..ac61053cc135 100644 --- a/web/po/si.po +++ b/web/po/si.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,33 +40,33 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +msgid "Please input required fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -122,12 +121,15 @@ msgstr "" msgid "Next year" msgstr "" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +msgid "Are you sure you want to {action} {name}" msgstr "" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -136,9 +138,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -154,7 +156,8 @@ msgstr "" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -259,36 +262,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -298,19 +290,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -348,18 +340,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -459,7 +444,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -507,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -523,8 +508,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -536,21 +521,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -558,56 +537,45 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -623,7 +591,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -645,7 +613,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -673,21 +641,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -751,6 +719,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -821,7 +802,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1004,7 +985,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1029,6 +1010,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1055,7 +1042,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1068,7 +1055,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1079,53 +1066,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1162,7 +1149,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1187,7 +1174,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1570,6 +1558,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1597,30 +1593,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2000,7 +1997,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2156,7 +2153,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2165,7 +2162,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2358,12 +2355,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2372,30 +2369,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2416,34 +2413,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2491,7 +2488,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2528,7 +2525,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2541,15 +2538,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2667,7 +2664,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2713,7 +2710,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2743,7 +2740,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2751,7 +2748,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2786,6 +2783,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2812,7 +2819,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2875,7 +2882,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2981,9 +2988,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2991,7 +2999,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3049,12 +3057,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3171,8 +3180,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3368,7 +3377,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3404,11 +3413,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3454,12 +3464,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3489,31 +3499,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3568,7 +3578,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3599,11 +3609,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3611,16 +3621,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3780,7 +3790,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3870,7 +3880,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3883,7 +3893,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3976,6 +3986,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4279,7 +4298,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4464,7 +4483,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4546,8 +4565,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4645,7 +4664,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4729,7 +4748,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4773,14 +4792,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4875,113 +4894,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5389,11 +5402,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5415,7 +5424,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6349,17 +6358,3 @@ msgstr "" #: ../html/src/utils/network.ts:105 msgid "HTTP Error code " msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" diff --git a/web/po/sk.po b/web/po/sk.po index 8b1e28b4f75a..887e1968feef 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-06-25 15:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" @@ -45,15 +44,17 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "Vzorec bol uložený. Pre tento vzorec nie je potrebné použiť highstate." -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +#, fuzzy +msgid "Please input required fields: {fields}" msgstr "Prosím, zadajte požadované polia: {0}" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +#, fuzzy +msgid "Invalid format of fields: {fields}" msgstr "Neplatný formát polí: {0}" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -61,19 +62,19 @@ msgstr "" "Na tejto stránke môžete nakonfigurovať vzorce Salt na automatickú inštaláciu " "a konfiguráciu softvéru." -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "Rozbaliť všetky sekcie" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "Zbaliť všetky sekcie" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "Bez názvu" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "Hľadať podľa názvu skupiny vzorca" @@ -131,12 +132,17 @@ msgstr "Predchádzajúci rok" msgid "Next year" msgstr "Nasledujúci rok" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +#, fuzzy +msgid "Are you sure you want to {action} {name}" msgstr "Naozaj chcete {0} {1} " #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +#, fuzzy +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "Naozaj chcete {0} vybrané položky {1}? ({2} položiek {1} vybraných)" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -145,9 +151,9 @@ msgstr "Naozaj chcete {0} vybrané položky {1}? ({2} položiek {1} vybraných)" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -163,7 +169,8 @@ msgstr "Zrušiť" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -273,36 +280,27 @@ msgstr "Začať písať..." msgid "No flavor" msgstr "Žiadny druh" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +#, fuzzy +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "Akcia bola úspešne pridaná do reťazca akcií '{0}'." -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "naplánované" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." -msgstr "Akcia bola {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +#, fuzzy +msgid "The action has been scheduled." +msgstr "Import obrazu bol naplánovaný." -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "Nie je možné vymazať výber" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "Nie je možné vykonať akciu." -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -312,19 +310,19 @@ msgstr "Nie je možné vykonať akciu." msgid "Confirm" msgstr "Potvrdiť" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "Späť na zoznam" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "Filtrovať podľa názvu balíka" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -362,18 +360,12 @@ msgid "Last" msgstr "Posledná" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "Stránka" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "z" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "Stránka {0} z {1}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -475,7 +467,8 @@ msgid "There are no entries to show." msgstr "Nie sú k dispozícii žiadne záznamy na zobrazenie." #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "Konfiguračný kanál: {0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -525,8 +518,8 @@ msgstr "" "vyhľadávanie." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -541,8 +534,8 @@ msgid "Back" msgstr "Späť" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "Uložiť zmeny" @@ -554,21 +547,16 @@ msgstr "Stavy vykonania" msgid "Reorder" msgstr "Preusporiadať" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "stavy" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" -msgstr "konfiguračné kanály" +#: ../html/src/components/states-picker.tsx:385 +#, fuzzy +msgid "Search in states" +msgstr "Vyhľadať systémy" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" -msgstr "Hľadať v {0}" +msgid "Search in configuration channels" +msgstr "Hľadať v konfiguračných kanáloch" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -576,56 +564,49 @@ msgstr "Hľadať v {0}" msgid "Search" msgstr "Hľadať" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "Štát" - -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "Kanál" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "Upraviť {0} poradia" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" msgstr "Upraviť {0} poradia" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "Upraviť poradie {0} ich pretiahnutím." + #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +#, fuzzy +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "Upraviť poradie {0} ich pretiahnutím." -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "Nie sú priradené žiadne stavy." -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "Názov stavu" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "Názov kanála" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "Označenie stavu" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "Označenie kanála" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -641,7 +622,7 @@ msgstr "Označenie kanála" msgid "Description" msgstr "Popis" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "Priradiť" @@ -663,7 +644,7 @@ msgid "Non-Virtual System" msgstr "Nevirtuálny systém" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "Proxy" @@ -691,21 +672,23 @@ msgstr "Filter" msgid "Select a filter" msgstr "Vybrať filter" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "Položky {0} - {1} z {2}" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" -msgstr "(Vybrané {0})" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" +msgstr "Vymazať vybrané" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vyčistiť" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "Vybrať všetko" @@ -769,6 +752,19 @@ msgstr "žiaden" msgid "Require this channel" msgstr "Vyžadovať tento kanál" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "foo" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "nedefinované" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "Aby sa prejavili konfiguračné zmeny, je potrebný reštart." @@ -852,7 +848,7 @@ msgstr "Vyskytla sa chyba. Stav monitorovania nie je známy. Obnovte stránku." #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1036,7 +1032,7 @@ msgstr "Filtrovať podľa ľubovoľnej hodnoty" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "Hostiteľ" @@ -1061,6 +1057,12 @@ msgstr "Stav poslednej aktualizácie" msgid "never" msgstr "nikdy" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "z" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "Pridať priebežnú platbu" @@ -1089,7 +1091,7 @@ msgstr "Úspešne aktualizované vlastnosti priebežnej platby" msgid "Edit Information" msgstr "Upraviť informácie" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "Upravovanie vlastností.." @@ -1102,7 +1104,7 @@ msgstr "Posledná aktualizácia stavu" msgid "Edit " msgstr "Upraviť " -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "Úprava údajov pripojenia ssh.." @@ -1115,53 +1117,54 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "Port SSH" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "Používateľ" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "Heslo" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "Súkromný kľúč SSH" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "Heslo súkromného kľúča SSH" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "Hľadaný inštancia neexistuje alebo bola vymazaná" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +#, fuzzy +msgid "Instance Hostname: {host}" msgstr "Názov hostiteľa inštancie: {0}" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "Vymazať priebežnú platbu" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "Naozaj chcete vymazať projekt" @@ -1198,7 +1201,7 @@ msgstr "Operácia nebola úspešná: Prázdna odpoveď zo servera" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "Podrobnosti" @@ -1226,8 +1229,10 @@ msgid "Selected channels were scheduled successfully for syncing." msgstr "Synchronizácia vybraných kanálov bola úspešne naplánovaná." #: ../html/src/manager/admin/setup/products/products.tsx:270 +#, fuzzy msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" "Nasledujúce inštalácie kanálov pre '{0}' zlyhali. Skontrolujte, prosím, " "súbory záznamov." @@ -1628,6 +1633,14 @@ msgstr "Znovu zostaviť" msgid "Patch available but needs to be cloned into Channel." msgstr "Oprava je k dispozícii, ale je potrebné ju naklonovať do kanála." +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "Kanál" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "Opravy chýb" @@ -1657,34 +1670,37 @@ msgstr "Momentálne nie sú k dispozícii žiadne dáta priradenia." msgid "You can also trigger a first run now by clicking the button below." msgstr "Môžete tiež teraz spustiť prvý beh kliknutím na tlačidlo nižšie." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +#, fuzzy +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "Priraďovacie dáta sa momentálne prepočítavajú, bolo to spustené {0}." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 +#, fuzzy msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" "Najnovšie úspešné dáta priradenia boli vypočítané {0}, nový beh môžete " "spustiť kliknutím na tlačidlo nižšie." -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" "Dáta priradenia sa počítajú podľa plánu úloh, každú noc v predvolenom " "nastavení (môžete " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "zmeniť plán úloh z administračnej stránky" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "). " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "Obnoviť priraďovacie údaje" @@ -2086,7 +2102,7 @@ msgstr "Obdobie" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2243,7 +2259,7 @@ msgid "Last Build" msgstr "Posledné zostavenie" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "Životný cyklus prostredia" @@ -2252,7 +2268,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "Hľadaný projekt neexistuje alebo bol vymazaný" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +#, fuzzy +msgid "Content Lifecycle Project - {name}" msgstr "Projekt životného cyklu obsahu - {0}" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2445,12 +2462,13 @@ msgstr "povoliť modul" msgid "disable all modules" msgstr "zakázať všetky moduly" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" msgstr "Zostaviť ({0})" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2459,15 +2477,16 @@ msgstr "Zostaviť ({0})" msgid "Build" msgstr "Zostaviť" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "Zostaviť projekt" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" msgstr "Zostavuje sa projekt.." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." @@ -2475,16 +2494,18 @@ msgstr "" "Projekt obsahuje kanály s nesynchronizovanými opravami. Budú synchronizované " "v závislosti od vašich nastavení organizácie." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "Správa o verzii" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +#, fuzzy +msgid "Version {version} history" msgstr "História verzie {0}" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +#, fuzzy +msgid "Version {version} successfully built into {environmentName}" msgstr "Verzia {0} bola úspešne zabudovaná do {1}" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2505,34 +2526,36 @@ msgstr "Označenie" msgid "Insert before" msgstr "Vložte pred" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "Pridať prostredie" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "Prostredie bolo úspešne vytvorené" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "Vytváranie prostredia..." -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "Neboli vytvorené žiadne prostredia" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "Prostredie bolo úspešne aktualizované" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" msgstr "Prostredie {0} bolo úspešne vymazané" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 +#, fuzzy msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" "Toto prostredie nemožno odstrániť, pretože sa používa v {0}distribúcii s " "automatickou inštaláciou{1}." @@ -2582,7 +2605,8 @@ msgid "Create New Filter" msgstr "Vytvoriť nový filter" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +#, fuzzy +msgid "Edit Filter {name}" msgstr "Upraviť filter {0}" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2620,7 +2644,7 @@ msgstr "" "Žiadna verzia na povýšenie alebo prebieha kolidujúce zostavenie prostredia" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "Povýšiť" @@ -2633,15 +2657,17 @@ msgid "Target environment" msgstr "Cieľové prostredie" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +#, fuzzy +msgid "Promote version {version} into {environmentName}" msgstr "Povýšiť verziu {0} na {1}" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "Povýšiť prostredie" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +#, fuzzy +msgid "Version {version} successfully promoted into {environmentName}" msgstr "Verzia {0} bola úspešne povýšená na {1}" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2759,7 +2785,8 @@ msgid "Page Not Found" msgstr "Stránka nenájdená" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +#, fuzzy +msgid "The page you requested, {currentUrl}, was not found." msgstr "Požadovaná stránka {0} sa nenašla." #: ../html/src/manager/errors/not-found.tsx:12 @@ -2817,7 +2844,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "Highstate" @@ -2847,7 +2874,7 @@ msgstr "Systémy" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2855,7 +2882,7 @@ msgstr "Balíky" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2892,6 +2919,16 @@ msgstr "Akcia bola úspešne pridaná do Reťazca akcií " msgid "Building the image has been " msgstr "Zostavenie obrazu bolo " +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "naplánované" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "Súhrn profilu" @@ -2918,7 +2955,7 @@ msgstr "Cesta" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "Aktivačný kľúč" @@ -2981,7 +3018,7 @@ msgstr "Import" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "Vymazať polia" @@ -3089,9 +3126,11 @@ msgstr "Vymazať vybrané profil(y)" msgid "Are you sure you want to delete the selected profile?" msgstr "Naozaj chcete vymazať vybraný profil?" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "Naozaj chcete vymazať vybrané profily? ({0} vybraných profilov)" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -3099,7 +3138,7 @@ msgid "Use credentials" msgstr "Použiť prihlasovanie údaje" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3157,12 +3196,14 @@ msgstr "Vymazať vybrané úložisko(á)" msgid "Are you sure you want to delete the selected store?" msgstr "Naozaj chcete vymazať vybrané úložisko?" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "Naozaj chcete vymazať vybrané úložiská? ({0} vybraných úložísk)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "Záznam o zostavení" @@ -3279,8 +3320,9 @@ msgid "Edit store" msgstr "Upraviť úložisko" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "Podrobnosti inštancie pre '{0}'" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3476,7 +3518,7 @@ msgid "Unknown" msgstr "Neznáme" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "Beh programu" @@ -3512,11 +3554,13 @@ msgstr "Vymazať vybrané obraz(y)" msgid "Are you sure you want to delete the selected image?" msgstr "Naozaj chcete vymazať vybraný obraz?" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "Naozaj chcete vymazať vybrané obrazy? ({0} vybraných obrazov)" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Prehľad" @@ -3575,12 +3619,12 @@ msgstr "" "Objavte nový spôsob správy serverov, balíkov, opráv a ďalšieho " "prostredníctvom jedného rozhrania." -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" -msgstr "_prázdne" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." +msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3612,31 +3656,31 @@ msgstr "Zistiť viac o" msgid "Login" msgstr "Prihlasovacie meno" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "Preskočiť na posledné okno údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "Preskočiť na ďalšie okno údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "Už neexistujú okná minulej údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "Už neexistujú okná budúcej údržby" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "Dnes" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "Mesiac" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "Deň" @@ -3692,7 +3736,7 @@ msgid "Delete maintenance schedule" msgstr "Vymazať plán údržby" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "Priradené systémy" @@ -3723,11 +3767,12 @@ msgstr "Viacnásobný" msgid "Schedule Details" msgstr "Podrobnosti plánu" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +#, fuzzy +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "Plán údržby bol priradený k {0} systému(om)" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3735,16 +3780,17 @@ msgstr "Plán údržby bol priradený k {0} systému(om)" msgid "Cancel affected actions" msgstr "Zrušiť ovplyvnené akcie" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "Vyhľadať systémy" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "Aktuálny plán" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +#, fuzzy +msgid "Url '{url}' is invalid" msgstr "Url '{0}' je neplatné" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3911,7 +3957,8 @@ msgid "Maintenance Schedules" msgstr "Plány údržby" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +#, fuzzy +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "Priradiť plán údržby k {0} systému(om)" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -4006,7 +4053,7 @@ msgstr "Načítavajú obsahy scenárov.." #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "Režim testu" @@ -4019,7 +4066,8 @@ msgid "Schedule playbook execution" msgstr "Naplánovať vykonanie scenára" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +#, fuzzy +msgid "Playbook '{name}'" msgstr "Scenár '{0}'" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -4112,6 +4160,15 @@ msgstr "Odstránený" msgid "Package States" msgstr "Stavy balíkov" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "Štát" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "Stavy balíkov boli uložené." @@ -4428,7 +4485,7 @@ msgid "Proxy SSH port" msgstr "Port Proxy SSH" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "Rozsah portov: 1 - 65535" @@ -4613,7 +4670,8 @@ msgid "Are you sure you want to delete this schedule?" msgstr "Naozaj chcete vymazať tento plán?" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +#, fuzzy +msgid "State configuration for {name}" msgstr "Konfigurácia stavu pre {0}" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4696,9 +4754,10 @@ msgid "Error when deleting the action. Check if Taskomatic is running" msgstr "Chyba pri vymazávaní akcie. Skontrolujte, či je spustený Taskomatic" #: ../html/src/manager/recurring/recurring-actions.tsx:148 +#, fuzzy msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" "Nižšie uvedené časy sa zobrazujú v časovom pásme servera {0}. Naplánovaný " "čas bude časom servera." @@ -4798,7 +4857,8 @@ msgid "No minions matched the target expression." msgstr "Žiadni klienti minion sa nezhodovali s cieľovým výrazom." #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +#, fuzzy +msgid "Server returned an error: {message}" msgstr "Server vrátil chybu: {0}" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4882,7 +4942,8 @@ msgid "Manager" msgstr "Manager" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +#, fuzzy +msgid "State Summary for {name}" msgstr "Súhrn stavu pre {0}" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4926,14 +4987,15 @@ msgid "System Group" msgstr "Systémová skupina" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +#, fuzzy +msgid "Applying the highstate has been scheduled." msgstr "Použitie highstate bolo {0}." -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "Použiť Highstate" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "Vytvoriť opakovanie sa" @@ -5032,46 +5094,40 @@ msgstr "" "Požiadavka bola prerušená alebo bola zo servera prijatá neplatná odpoveď. " "Prosím, skontrolujte, či bol váš klient minion správne zavedený." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "Hostiteľ bol úspešne zavedený! Váš systém by sa mal objaviť v" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "systémy" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 +#, fuzzy msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" "krátko. Ak ide o transakčný systém, reštartujte ho a dokončite registráciu" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "Zobraziť ďalšie podrobnosti o tejto chybe" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "Nie je možné zaviesť hostiteľa. Vyskytli sa nasledujúce chyby:" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "Váš systém sa zavádza: čakanie na odpoveď.." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "Načítava sa súkromný kľúč SSH..." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "Zavádzať" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "napr. ••••••••••••" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" @@ -5079,62 +5135,65 @@ msgstr "" "Súbor bude uložený v dočasnom súbore na serveri a bude vymazaný po " "zavádzacej procedúre" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "Nechajte prázdne pre žiadne heslo" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "Zavádzať klientov minion" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 +#, fuzzy msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" "Systémy, ktoré sa majú spravovať, môžete pridať iba poskytnutím " "prihlasovacích údajov SSH. {0} pripraví systém vzdialene a vykoná " "registráciu." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "napr. host.domain.com" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 +#, fuzzy msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" "Používateľ bude mať účinok iba počas zavádzacieho procesu. Ďalšie pripojenia " "uskutoční používateľ uvedený v rhn.conf. Predvolený používateľ pre kľúč " "'ssh_push_sudo_user' je 'root'. Tento používateľ je nastavený po nasadení " "kľúča SSH {0} počas zavádzacej procedúry." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "Metóda overenia" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "Riadiaci uzol Ansible" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "Žiadny" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "Reaktivačný kľúč" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "Ponechať prázdne, ak sa nevyžaduje reaktivácia" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." @@ -5142,15 +5201,15 @@ msgstr "" "Názov hostiteľa servera proxy nie je plne kvalifikovaný. To môže spôsobiť " "problémy pri prístupe ku kanálom." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "Zakázať prísnu kontrolu kľúča hostiteľa SSH počas zavádzacieho procesu" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "Spravovať systém kompletne cez SSH (neinštaluje sa agent)" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "Naozaj chcete zavrieť túto stránku, kým prebieha zavádzanie?" @@ -5579,12 +5638,9 @@ msgid "Nutanix AHV" msgstr "Nutanix AHV" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "Správca virtuálnych hostiteľov" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "Pridať {0}" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "Upraviť správcov virtuálnych hostiteľov" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5607,7 +5663,8 @@ msgstr "" "sú načítané." #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +#, fuzzy +msgid "{name} selected" msgstr "Vybrané {0}" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6559,22 +6616,41 @@ msgstr "Zdroj sa nenašiel." msgid "HTTP Error code " msgstr "Kód chyby HTTP " -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "foo" +#~ msgid "The action has been {0}." +#~ msgstr "Akcia bola {0}." -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "nedefinované" +#~ msgid "Page" +#~ msgstr "Stránka" + +#~ msgid "states" +#~ msgstr "stavy" + +#~ msgid "configuration channels" +#~ msgstr "konfiguračné kanály" + +#~ msgid "Search in {0}" +#~ msgstr "Hľadať v {0}" + +#~ msgid "({0} selected)" +#~ msgstr "(Vybrané {0})" + +#~ msgid "_blank" +#~ msgstr "_prázdne" + +#~ msgid "Successfully bootstrapped host! Your system should appear in" +#~ msgstr "Hostiteľ bol úspešne zavedený! Váš systém by sa mal objaviť v" + +#~ msgid "systems" +#~ msgstr "systémy" + +#~ msgid "Virtual Host Manager" +#~ msgstr "Správca virtuálnych hostiteľov" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "foo {0} tea {1}" +#~ msgid "Add a {0}" +#~ msgstr "Pridať {0}" -#~ msgid "Search in configuration channels" -#~ msgstr "Hľadať v konfiguračných kanáloch" +#~ msgid "foo {0} tea {1}" +#~ msgstr "foo {0} tea {1}" #~ msgid "Documentation" #~ msgstr "Dokumentácia" diff --git a/web/po/spacewalk-web.pot b/web/po/spacewalk-web.pot index 02eb6a0d11a9..0c007ed0a537 100644 --- a/web/po/spacewalk-web.pot +++ b/web/po/spacewalk-web.pot @@ -7,19 +7,18 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,33 +41,33 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +msgid "Please input required fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -123,12 +122,15 @@ msgstr "" msgid "Next year" msgstr "" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +msgid "Are you sure you want to {action} {name}" msgstr "" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -137,9 +139,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -155,7 +157,8 @@ msgstr "" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -260,36 +263,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -299,19 +291,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -349,18 +341,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -460,7 +445,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -508,8 +493,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -524,8 +509,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -537,21 +522,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -559,56 +538,45 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -624,7 +592,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -646,7 +614,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -674,21 +642,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -752,6 +720,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -822,7 +803,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1005,7 +986,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1030,6 +1011,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1056,7 +1043,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1069,7 +1056,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1080,53 +1067,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1163,7 +1150,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1188,7 +1175,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1571,6 +1559,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1598,30 +1594,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2001,7 +1998,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2157,7 +2154,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2166,7 +2163,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2359,12 +2356,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2373,30 +2370,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2417,34 +2414,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2492,7 +2489,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2529,7 +2526,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2542,15 +2539,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2668,7 +2665,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2714,7 +2711,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2744,7 +2741,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2752,7 +2749,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2787,6 +2784,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2813,7 +2820,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2876,7 +2883,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2982,9 +2989,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2992,7 +3000,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3050,12 +3058,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3172,8 +3181,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3369,7 +3378,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3405,11 +3414,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3455,12 +3465,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3490,31 +3500,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3569,7 +3579,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3600,11 +3610,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3612,16 +3622,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3781,7 +3791,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3871,7 +3881,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3884,7 +3894,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3977,6 +3987,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4280,7 +4299,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4465,7 +4484,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4547,8 +4566,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4646,7 +4665,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4730,7 +4749,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4774,14 +4793,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4876,113 +4895,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5390,11 +5403,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5416,7 +5425,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6350,17 +6359,3 @@ msgstr "" #: ../html/src/utils/network.ts:105 msgid "HTTP Error code " msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" diff --git a/web/po/zh_CN.po b/web/po/zh_CN.po index a9d43b92db68..d730c662fabd 100644 --- a/web/po/zh_CN.po +++ b/web/po/zh_CN.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-06-26 04:15+0000\n" "Last-Translator: Grace Yu \n" "Language-Team: Chinese (China) '{name}'." msgstr "操作已成功添加到操作链 \"{0}\"。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" -msgstr "已安排" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." -msgstr "操作已{0}。" +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +#, fuzzy +msgid "The action has been scheduled." +msgstr "已安排映像导入。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "无法清除选择" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "无法执行操作。" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -305,19 +303,19 @@ msgstr "无法执行操作。" msgid "Confirm" msgstr "确认" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "返回列表" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "按软件包名称过滤" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -355,18 +353,12 @@ msgid "Last" msgstr "最后一页" #: ../html/src/components/pagination.tsx:93 -msgid "Page" -msgstr "页码" - -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "/" +msgid "Page of {total}" +msgstr "" -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +#, fuzzy +msgid "Page {current} of {total}" msgstr "第 {0} 页，共 {1} 页" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -466,7 +458,8 @@ msgid "There are no entries to show." msgstr "没有可显示的项。" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +#, fuzzy +msgid "Configuration Channel: {name}" msgstr "配置通道：{0}" #: ../html/src/components/salt-state-popup.tsx:60 @@ -514,8 +507,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "未指派状态。请使用搜索来查找并指派状态。" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -530,8 +523,8 @@ msgid "Back" msgstr "上一步" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "保存更改" @@ -543,21 +536,16 @@ msgstr "执行状态" msgid "Reorder" msgstr "重新排序" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "状态" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" -msgstr "配置通道" +#: ../html/src/components/states-picker.tsx:385 +#, fuzzy +msgid "Search in states" +msgstr "搜索系统" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" -msgstr "在 {0} 中搜索" +msgid "Search in configuration channels" +msgstr "在配置通道中搜索" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -565,56 +553,49 @@ msgstr "在 {0} 中搜索" msgid "Search" msgstr "搜索" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" -msgstr "州/省" - -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" -msgstr "通道" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit State Ranks" +msgstr "编辑{0}排名" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:401 +#, fuzzy +msgid "Edit Channel Ranks" msgstr "编辑{0}排名" +#: ../html/src/components/states-picker.tsx:404 +#, fuzzy +msgid "Edit the ranking of the states by dragging them." +msgstr "通过拖放来编辑{0}排名。" + #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +#, fuzzy +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "通过拖放来编辑{0}排名。" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "未指派任何状态。" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "状态名称" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "通道名称" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "状态标签" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "通道标签" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -630,7 +611,7 @@ msgstr "通道标签" msgid "Description" msgstr "说明" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "指派" @@ -655,7 +636,7 @@ msgid "Non-Virtual System" msgstr "虚拟系统" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "代理" @@ -683,21 +664,23 @@ msgstr "过滤" msgid "Select a filter" msgstr "选择过滤器" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +#, fuzzy +msgid "Items {from} - {to} of {total}" msgstr "第 {0} - {1} 项，共 {2} 项" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" -msgstr "（已选择 {0} 个）" +#: ../html/src/components/table/SearchPanel.tsx:62 +#, fuzzy +msgid "({selectedCount} selected)" +msgstr "删除选定项" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "清除" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "全选" @@ -761,6 +744,19 @@ msgstr "无" msgid "Require this channel" msgstr "需要此通道" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "foo" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "未定义" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "需要重启动才能使配置更改生效。" @@ -831,7 +827,7 @@ msgstr "发生错误。监视状态未知。请刷新页面。" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1014,7 +1010,7 @@ msgstr "按任意值过滤" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "主机" @@ -1039,6 +1035,12 @@ msgstr "上次更新状态" msgid "never" msgstr "从不" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "/" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "添加 Pay-as-you-go" @@ -1065,7 +1067,7 @@ msgstr "已成功更新 Pay-as-you-go 属性" msgid "Edit Information" msgstr "编辑信息" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "正在编辑属性..." @@ -1078,7 +1080,7 @@ msgstr "上次状态更新" msgid "Edit " msgstr "编辑 " -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "正在编辑 SSH 连接数据..." @@ -1089,53 +1091,54 @@ msgstr "编辑 SSH 连接时，必须重新提供所有需要的身份凭证。" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "SSH 端口" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "用户" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "口令" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "SSH 私用密钥" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "SSH 私用密钥通行口令" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "您要查找的实例不存在或已删除" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +#, fuzzy +msgid "Instance Hostname: {host}" msgstr "实例主机名：{0}" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "删除 Pay-as-you-go" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "您确定要删除项目吗" @@ -1172,7 +1175,7 @@ msgstr "操作不成功：服务器返回了空答复" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "细节" @@ -1197,8 +1200,10 @@ msgid "Selected channels were scheduled successfully for syncing." msgstr "已成功安排同步选定的通道。" #: ../html/src/manager/admin/setup/products/products.tsx:270 +#, fuzzy msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "\"{0}\" 的下列通道安装失败。请检查日志文件。" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1585,6 +1590,14 @@ msgstr "重构建" msgid "Patch available but needs to be cloned into Channel." msgstr "补丁可用，但需要克隆到通道中。" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "通道" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "勘误" @@ -1614,30 +1627,33 @@ msgstr "当前没有可用的匹配数据。" msgid "You can also trigger a first run now by clicking the button below." msgstr "您也可以单击以下按钮立即触发首次运行。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +#, fuzzy +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "当前正在重新计算匹配数据，开始时间为 {0}。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 +#, fuzzy msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "在 {0} 已计算出最新成功的匹配数据，您可以单击以下按钮触发新的运行。" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "默认将在夜间通过任务日程安排计算匹配数据（可以 " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "通过管理页更改任务日程安排" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "）。 " -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "刷新匹配数据" @@ -2019,7 +2035,7 @@ msgstr "纪元" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2175,7 +2191,7 @@ msgid "Last Build" msgstr "上次构建" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "环境生命周期" @@ -2184,7 +2200,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "您要查找的项目不存在或已删除" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +#, fuzzy +msgid "Content Lifecycle Project - {name}" msgstr "内容生命周期项目 - {0}" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2377,12 +2394,13 @@ msgstr "启用模块" msgid "disable all modules" msgstr "禁用所有模块" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +#, fuzzy +msgid "Build ({count})" msgstr "构建 ({0})" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2391,30 +2409,33 @@ msgstr "构建 ({0})" msgid "Build" msgstr "构建" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "构建项目" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +#, fuzzy +msgid "Building project" msgstr "正在构建项目..." -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "该项目包含的通道具有未同步的补丁。将根据您的组织设置同步这些补丁。" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "版本消息" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +#, fuzzy +msgid "Version {version} history" msgstr "版本 {0} 历史记录" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +#, fuzzy +msgid "Version {version} successfully built into {environmentName}" msgstr "已成功在 {1} 中构建版本 {0}" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2435,34 +2456,36 @@ msgstr "标签" msgid "Insert before" msgstr "在前面插入" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "添加环境" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "已成功创建环境" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "正在创建环境..." -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "未创建环境" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "已成功更新环境" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +#, fuzzy +msgid "Environment {name} deleted successfully" msgstr "已成功删除环境 {0}" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 +#, fuzzy msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "此环境正被某个{0}自动安装发行套件{1}使用，无法删除。" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2510,7 +2533,8 @@ msgid "Create New Filter" msgstr "创建新过滤器" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +#, fuzzy +msgid "Edit Filter {name}" msgstr "编辑过滤器 {0}" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2547,7 +2571,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "没有可升级的版本，或者正在进行有冲突的环境构建" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "升级" @@ -2560,15 +2584,17 @@ msgid "Target environment" msgstr "目标环境" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +#, fuzzy +msgid "Promote version {version} into {environmentName}" msgstr "将版本 {0} 升级到 {1}" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "升级环境" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +#, fuzzy +msgid "Version {version} successfully promoted into {environmentName}" msgstr "已成功将版本 {0} 升级到 {1}" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2686,7 +2712,8 @@ msgid "Page Not Found" msgstr "找不到页面" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +#, fuzzy +msgid "The page you requested, {currentUrl}, was not found." msgstr "未找到您请求的页面 {0}。" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2732,7 +2759,7 @@ msgstr "已保存公式。请编辑已启用公式中的配置选项并应用 " #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "Highstate" @@ -2762,7 +2789,7 @@ msgstr "系统" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2770,7 +2797,7 @@ msgstr "软件包" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2805,6 +2832,16 @@ msgstr "操作已成功添加到操作链 " msgid "Building the image has been " msgstr "映像构建 " +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "已安排" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "配置文件摘要" @@ -2831,7 +2868,7 @@ msgstr "路径" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "激活密钥" @@ -2894,7 +2931,7 @@ msgstr "导入" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "清除字段" @@ -3000,9 +3037,11 @@ msgstr "删除选定的配置文件" msgid "Are you sure you want to delete the selected profile?" msgstr "您确定要删除选定的配置文件吗？" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 +#, fuzzy msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "您确定要删除选定的配置文件吗？（已选择 {0} 个配置文件）" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -3010,7 +3049,7 @@ msgid "Use credentials" msgstr "使用身份凭证" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3068,12 +3107,14 @@ msgstr "删除选定的储存" msgid "Are you sure you want to delete the selected store?" msgstr "您确定要删除选定的储存吗？" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +#, fuzzy +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "您确定要删除选定的存储区吗？（已选择 {0} 个存储区）" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "构建日志" @@ -3190,8 +3231,9 @@ msgid "Edit store" msgstr "编辑储存" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +#, fuzzy +msgid "Instance Details for '{name}'" msgstr "'{0}' 的实例细节" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3387,7 +3429,7 @@ msgid "Unknown" msgstr "未知" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "运行时" @@ -3423,11 +3465,13 @@ msgstr "删除选定的映像" msgid "Are you sure you want to delete the selected image?" msgstr "您确定要删除选定的映像吗？" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +#, fuzzy +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "您确定要删除选定的映像吗？（已选择 {0} 个映像）" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "概览" @@ -3474,12 +3518,12 @@ msgid "" "one interface." msgstr "发掘通过一个界面管理服务器、软件包、补丁等资源的新方式。" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" -msgstr "空白(_B)" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." +msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3509,31 +3553,31 @@ msgstr "了解详细信息" msgid "Login" msgstr "登录" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "跳到最后一个维护时段" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "跳到下一个维护时段" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "没有更多过去的维护时段" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "没有更多将来的维护时段" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "今天" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "月" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "日" @@ -3588,7 +3632,7 @@ msgid "Delete maintenance schedule" msgstr "删除维护日程安排" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "指派的系统" @@ -3619,11 +3663,12 @@ msgstr "多" msgid "Schedule Details" msgstr "日程安排细节" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +#, fuzzy +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "已将维护日程安排指派到 {0} 个系统" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3631,16 +3676,17 @@ msgstr "已将维护日程安排指派到 {0} 个系统" msgid "Cancel affected actions" msgstr "取消受影响的操作" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "搜索系统" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "当前日程安排" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +#, fuzzy +msgid "Url '{url}' is invalid" msgstr "URL '{0}' 无效" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3800,7 +3846,8 @@ msgid "Maintenance Schedules" msgstr "维护日程安排" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +#, fuzzy +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "将维护日程安排指派到 {0} 个系统" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3890,7 +3937,7 @@ msgstr "正在装载剧本内容..." #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "测试模式" @@ -3903,7 +3950,8 @@ msgid "Schedule playbook execution" msgstr "安排剧本执行" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +#, fuzzy +msgid "Playbook '{name}'" msgstr "剧本 \"{0}\"" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3996,6 +4044,15 @@ msgstr "已去除" msgid "Package States" msgstr "软件包状态" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "州/省" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "已保存软件包状态。" @@ -4302,7 +4359,7 @@ msgid "Proxy SSH port" msgstr "代理 SSH 端口" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "端口范围：1 - 65535" @@ -4487,7 +4544,8 @@ msgid "Are you sure you want to delete this schedule?" msgstr "您确定要删除此日程安排吗？" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +#, fuzzy +msgid "State configuration for {name}" msgstr "{0} 的状态配置" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4568,9 +4626,10 @@ msgid "Error when deleting the action. Check if Taskomatic is running" msgstr "删除操作时出错。请检查 Taskomatic 是否正在运行" #: ../html/src/manager/recurring/recurring-actions.tsx:148 +#, fuzzy msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "服务器时区 {0} 中会显示以下时间。安排的时间将会是服务器时间。" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4668,7 +4727,8 @@ msgid "No minions matched the target expression." msgstr "没有任何受控端与目标表达式匹配。" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +#, fuzzy +msgid "Server returned an error: {message}" msgstr "服务器返回了错误：{0}" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4752,7 +4812,8 @@ msgid "Manager" msgstr "Manager" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +#, fuzzy +msgid "State Summary for {name}" msgstr "{0} 的状态摘要" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4796,14 +4857,15 @@ msgid "System Group" msgstr "系统组" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +#, fuzzy +msgid "Applying the highstate has been scheduled." msgstr "应用 highstate 的操作已{0}。" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "应用 Highstate" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "创建重复性" @@ -4907,117 +4969,114 @@ msgid "" msgstr "" "请求已中断，或者从服务器收到了无效响应。请检查您的受控端是否已正常引导。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "已成功引导主机！您的系统很快应会显示在" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "系统" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 +#, fuzzy msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "中。如果这是事务性系统，请将其重引导以完成注册" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "显示关于此错误的其他细节" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "无法引导主机。发生以下错误：" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "您的系统正在引导：正在等待响应..." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "正在装载 SSH 私用密钥..." -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "引导" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "例如 ••••••••••••" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "该文件将储存在服务器上的临时文件中，在完成引导过程后将被删除" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "留空表示无通行口令" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "引导受控端" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 +#, fuzzy msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" "只能通过提供 SSH 身份凭证来添加要管理的系统。{0} 将远程准备系统并执行注册。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "例如 host.domain.com" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 +#, fuzzy msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" "该用户仅在引导期间有效。以后的连接将由 rhn.conf 中指定的用户建" "立。\"ssh_push_sudo_user\" 键的默认用户为 \"root\"。此用户在引导期间部署 {0} " "的 SSH 密钥后设置。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "身份验证方法" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "Ansible 控制节点" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "无" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "重新激活密钥" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "如不需要重新激活，则留空" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "代理的主机名不是完全限定的。这可能导致在访问通道时出现问题。" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "在引导期间禁用 SSH 严格主机密钥检查" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "完全通过 SSH 管理系统（将不安装代理）" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "正在进行引导，您确定要关闭此页面吗？" @@ -5433,12 +5492,9 @@ msgid "Nutanix AHV" msgstr "Nutanix AHV" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "虚拟主机管理器" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" -msgstr "添加 {0}" +#, fuzzy +msgid "Add a {type} Virtual Host Manager" +msgstr "编辑虚拟主机管理器" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 msgid "Virtual Host Managers" @@ -5459,7 +5515,8 @@ msgid "" msgstr "KVM 和 Xen 均未运行。请确保已安装它们且已装载内核模块。" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +#, fuzzy +msgid "{name} selected" msgstr "已选择 {0}" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6395,22 +6452,41 @@ msgstr "未找到资源。" msgid "HTTP Error code " msgstr "HTTP 错误代码 " -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "foo" +#~ msgid "The action has been {0}." +#~ msgstr "操作已{0}。" -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "未定义" +#~ msgid "Page" +#~ msgstr "页码" + +#~ msgid "states" +#~ msgstr "状态" + +#~ msgid "configuration channels" +#~ msgstr "配置通道" + +#~ msgid "Search in {0}" +#~ msgstr "在 {0} 中搜索" + +#~ msgid "({0} selected)" +#~ msgstr "（已选择 {0} 个）" + +#~ msgid "_blank" +#~ msgstr "空白(_B)" + +#~ msgid "Successfully bootstrapped host! Your system should appear in" +#~ msgstr "已成功引导主机！您的系统很快应会显示在" + +#~ msgid "systems" +#~ msgstr "系统" + +#~ msgid "Virtual Host Manager" +#~ msgstr "虚拟主机管理器" -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "foo {0} tea {1}" +#~ msgid "Add a {0}" +#~ msgstr "添加 {0}" -#~ msgid "Search in configuration channels" -#~ msgstr "在配置通道中搜索" +#~ msgid "foo {0} tea {1}" +#~ msgstr "foo {0} tea {1}" #~ msgid "Documentation" #~ msgstr "文档" diff --git a/web/po/zh_HK.po b/web/po/zh_HK.po index 7af834a9ffb4..214c4cc033d4 100644 --- a/web/po/zh_HK.po +++ b/web/po/zh_HK.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,33 +40,33 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +msgid "Please input required fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -122,12 +121,15 @@ msgstr "" msgid "Next year" msgstr "" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +msgid "Are you sure you want to {action} {name}" msgstr "" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -136,9 +138,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -154,7 +156,8 @@ msgstr "" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -259,36 +262,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -298,19 +290,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -348,18 +340,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -459,7 +444,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -507,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -523,8 +508,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -536,21 +521,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -558,56 +537,45 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -623,7 +591,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -645,7 +613,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -673,21 +641,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -751,6 +719,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -821,7 +802,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1004,7 +985,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1029,6 +1010,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1055,7 +1042,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1068,7 +1055,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1079,53 +1066,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1162,7 +1149,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1187,7 +1174,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1570,6 +1558,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1597,30 +1593,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2000,7 +1997,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2156,7 +2153,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2165,7 +2162,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2358,12 +2355,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2372,30 +2369,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2416,34 +2413,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2491,7 +2488,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2528,7 +2525,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2541,15 +2538,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2667,7 +2664,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2713,7 +2710,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2743,7 +2740,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2751,7 +2748,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2786,6 +2783,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2812,7 +2819,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2875,7 +2882,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2981,9 +2988,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2991,7 +2999,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3049,12 +3057,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3171,8 +3180,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3368,7 +3377,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3404,11 +3413,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3454,12 +3464,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3489,31 +3499,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3568,7 +3578,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3599,11 +3609,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3611,16 +3621,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3780,7 +3790,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3870,7 +3880,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3883,7 +3893,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3976,6 +3986,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4279,7 +4298,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4464,7 +4483,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4546,8 +4565,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4645,7 +4664,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4729,7 +4748,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4773,14 +4792,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4875,113 +4894,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5389,11 +5402,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5415,7 +5424,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6349,17 +6358,3 @@ msgstr "" #: ../html/src/utils/network.ts:105 msgid "HTTP Error code " msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" diff --git a/web/po/zh_TW.po b/web/po/zh_TW.po index 3adf4a95c820..12f599a878ee 100644 --- a/web/po/zh_TW.po +++ b/web/po/zh_TW.po @@ -7,18 +7,17 @@ #: ../html/src/components/input/Range.tsx:47 #: ../html/src/components/input/Range.tsx:59 #: ../html/src/components/input/Range.tsx:60 +#: ../html/src/core/intl/index.test.tsx:9 #: ../html/src/manager/content-management/list-filters/list-filters.tsx:199 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:79 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:80 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:91 #: ../html/src/manager/virtualization/nets/properties/NetworkAddress.tsx:92 -#: ../html/src/utils/test-utils/setup/t.test.ts:7 -#: ../html/src/utils/test-utils/setup/t.ts:4 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-30 15:18+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,33 +40,33 @@ msgstr "" msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "" -#: ../html/src/components/FormulaForm.tsx:169 -msgid "Please input required fields: {0}" +#: ../html/src/components/FormulaForm.tsx:168 +msgid "Please input required fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:172 -msgid "Invalid format of fields: {0}" +#: ../html/src/components/FormulaForm.tsx:171 +msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:217 +#: ../html/src/components/FormulaForm.tsx:216 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:272 +#: ../html/src/components/FormulaForm.tsx:271 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:279 +#: ../html/src/components/FormulaForm.tsx:278 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:344 +#: ../html/src/components/FormulaForm.tsx:343 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:353 +#: ../html/src/components/FormulaForm.tsx:352 msgid "Search by formula's group name" msgstr "" @@ -122,12 +121,15 @@ msgstr "" msgid "Next year" msgstr "" +#. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -msgid "Are you sure you want to {0} {1} " +msgid "Are you sure you want to {action} {name}" msgstr "" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -msgid "Are you sure you want to {0} the selected {1}s? ({2} {1}s selected)" +msgid "" +"Are you sure you want to {action} the selected {name}s? ({count} {name}s " +"selected)" msgstr "" #: ../html/src/components/dialog/DangerDialog.tsx:61 @@ -136,9 +138,9 @@ msgstr "" #: ../html/src/components/dialog/LegacyDangerDialog.tsx:54 #: ../html/src/components/panels/CreatorPanel.tsx:114 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:183 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:128 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:105 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:129 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:108 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:109 #: ../html/src/manager/images/image-view-overview.tsx:741 #: ../html/src/manager/images/image-view-overview.tsx:742 #: ../html/src/manager/images/image-view-overview.tsx:814 @@ -154,7 +156,8 @@ msgstr "" #: ../html/src/components/dialog/DeleteDialog.tsx:29 #: ../html/src/components/panels/CreatorPanel.tsx:97 #: ../html/src/components/table/Table.tsx:139 -#: ../html/src/manager/admin/payg/payg.tsx:70 +#: ../html/src/manager/admin/payg/payg.tsx:73 +#: ../html/src/manager/admin/payg/payg.tsx:74 #: ../html/src/manager/content-management/list-filters/filter-edit.tsx:162 #: ../html/src/manager/content-management/project/project.tsx:109 #: ../html/src/manager/images/image-profiles.tsx:136 @@ -259,36 +262,25 @@ msgstr "" msgid "No flavor" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:83 -#: ../html/src/manager/state/highstate.tsx:65 -msgid "Action has been successfully added to the action chain '{0}'." -msgstr "" - -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -#: ../html/src/manager/images/image-build.tsx:211 -#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 -#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 -#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 -#: ../html/src/manager/state/highstate.tsx:71 -#: ../html/src/manager/systems/proxy.tsx:70 -#: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 -msgid "scheduled" +#: ../html/src/components/package/PackageListActionScheduler.tsx:82 +#: ../html/src/manager/state/highstate.tsx:64 +msgid "" +"Action has been successfully added to the action chain '{name}'." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:88 -msgid "The action has been {0}." +#: ../html/src/components/package/PackageListActionScheduler.tsx:89 +msgid "The action has been scheduled." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:94 +#: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:103 +#: ../html/src/components/package/PackageListActionScheduler.tsx:107 msgid "Unable to perform action." msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:176 +#: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 #: ../html/src/manager/admin/setup/products/products.tsx:1160 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 @@ -298,19 +290,19 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:185 +#: ../html/src/components/package/PackageListActionScheduler.tsx:189 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:202 msgid "Back to list" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:204 -#: ../html/src/components/package/PackageListActionScheduler.tsx:237 +#: ../html/src/components/package/PackageListActionScheduler.tsx:208 +#: ../html/src/components/package/PackageListActionScheduler.tsx:241 #: ../html/src/manager/packages/list.tsx:144 msgid "Filter by package name" msgstr "" -#: ../html/src/components/package/PackageListActionScheduler.tsx:210 -#: ../html/src/components/package/PackageListActionScheduler.tsx:242 +#: ../html/src/components/package/PackageListActionScheduler.tsx:214 +#: ../html/src/components/package/PackageListActionScheduler.tsx:246 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:143 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:152 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:162 @@ -348,18 +340,11 @@ msgid "Last" msgstr "" #: ../html/src/components/pagination.tsx:93 -msgid "Page" +msgid "Page of {total}" msgstr "" -#: ../html/src/components/pagination.tsx:108 -#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 -msgid "of" -msgstr "" - -#: ../html/src/components/pagination.tsx:114 -msgid "Page {0} of {1}" +#: ../html/src/components/pagination.tsx:115 +msgid "Page {current} of {total}" msgstr "" #: ../html/src/components/picker/recurring-event-picker.tsx:49 @@ -459,7 +444,7 @@ msgid "There are no entries to show." msgstr "" #: ../html/src/components/salt-state-popup.tsx:50 -msgid "Configuration Channel: {0}" +msgid "Configuration Channel: {name}" msgstr "" #: ../html/src/components/salt-state-popup.tsx:60 @@ -507,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:816 -#: ../html/src/manager/images/image-view.tsx:818 +#: ../html/src/manager/images/image-view.tsx:815 +#: ../html/src/manager/images/image-view.tsx:817 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -523,8 +508,8 @@ msgid "Back" msgstr "" #: ../html/src/components/states-picker.tsx:337 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:180 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:185 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:182 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:187 msgid "Save Changes" msgstr "" @@ -536,21 +521,15 @@ msgstr "" msgid "Reorder" msgstr "" -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "states" -msgstr "" - -#: ../html/src/components/states-picker.tsx:386 -#: ../html/src/components/states-picker.tsx:406 -msgid "configuration channels" +#: ../html/src/components/states-picker.tsx:385 +msgid "Search in states" msgstr "" #: ../html/src/components/states-picker.tsx:385 -msgid "Search in {0}" +msgid "Search in configuration channels" msgstr "" -#: ../html/src/components/states-picker.tsx:392 +#: ../html/src/components/states-picker.tsx:391 #: ../html/src/manager/header/search/search.tsx:77 #: ../html/src/manager/header/search/search.tsx:86 #: ../html/src/manager/minion/packages/package-states.tsx:214 @@ -558,56 +537,45 @@ msgstr "" msgid "Search" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/minion/packages/package-states.tsx:344 -#: ../html/src/manager/proxy/container-config.tsx:318 -#: ../html/src/manager/salt/keys/key-management.tsx:188 -#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 -#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 -#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 -msgid "State" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit State Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 -#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 -#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 -#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 -#: ../html/src/manager/packages/list.tsx:102 -msgid "Channel" +#: ../html/src/components/states-picker.tsx:401 +msgid "Edit Channel Ranks" msgstr "" -#: ../html/src/components/states-picker.tsx:402 -msgid "Edit {0} Ranks" +#: ../html/src/components/states-picker.tsx:404 +msgid "Edit the ranking of the states by dragging them." msgstr "" #: ../html/src/components/states-picker.tsx:405 -msgid "Edit the ranking of the {0} by dragging them." +msgid "Edit the ranking of the configuration channels by dragging them." msgstr "" -#: ../html/src/components/states-picker.tsx:412 +#: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 #: ../html/src/manager/recurring/recurring-actions-details.tsx:248 msgid "State Name" msgstr "" -#: ../html/src/components/states-picker.tsx:420 +#: ../html/src/components/states-picker.tsx:418 msgid "Channel Name" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 #: ../html/src/manager/recurring/recurring-actions-details.tsx:261 msgid "State Label" msgstr "" -#: ../html/src/components/states-picker.tsx:421 +#: ../html/src/components/states-picker.tsx:419 msgid "Channel Label" msgstr "" -#: ../html/src/components/states-picker.tsx:422 +#: ../html/src/components/states-picker.tsx:420 #: ../html/src/manager/admin/create-payg/create-payg.tsx:73 #: ../html/src/manager/admin/list-payg/list-payg.tsx:126 #: ../html/src/manager/admin/payg-shared/info/payg-info-form.tsx:23 @@ -623,7 +591,7 @@ msgstr "" msgid "Description" msgstr "" -#: ../html/src/components/states-picker.tsx:423 +#: ../html/src/components/states-picker.tsx:421 msgid "Assign" msgstr "" @@ -645,7 +613,7 @@ msgid "Non-Virtual System" msgstr "" #: ../html/src/components/systems.tsx:44 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:583 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 msgid "Proxy" msgstr "" @@ -673,21 +641,21 @@ msgstr "" msgid "Select a filter" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:56 -msgid "Items {0} - {1} of {2}" +#: ../html/src/components/table/SearchPanel.tsx:57 +msgid "Items {from} - {to} of {total}" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:59 -msgid "({0} selected)" +#: ../html/src/components/table/SearchPanel.tsx:62 +msgid "({selectedCount} selected)" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:61 +#: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" -#: ../html/src/components/table/SearchPanel.tsx:68 +#: ../html/src/components/table/SearchPanel.tsx:71 msgid "Select All" msgstr "" @@ -751,6 +719,19 @@ msgstr "" msgid "Require this channel" msgstr "" +#: ../html/src/core/intl/index.test.tsx:7 +msgid "foo" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:8 +msgid "undefined" +msgstr "" + +#: ../html/src/core/intl/index.test.tsx:16 +#: ../html/src/core/intl/index.test.tsx:17 +msgid "foo {insert} bar" +msgstr "" + #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." msgstr "" @@ -821,7 +802,7 @@ msgstr "" #: ../html/src/manager/audit/subscription-matching/subscription-matching-messages.tsx:58 #: ../html/src/manager/audit/subscription-matching/subscription-matching-pins.tsx:285 #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:201 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 #: ../html/src/manager/systems/all-list.tsx:21 #: ../html/src/manager/systems/all-list.tsx:76 @@ -1004,7 +985,7 @@ msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:116 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:52 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:15 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:450 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:455 msgid "Host" msgstr "" @@ -1029,6 +1010,12 @@ msgstr "" msgid "never" msgstr "" +#: ../html/src/manager/admin/list-payg/list-payg.tsx:166 +#: ../html/src/manager/admin/setup/products/products.tsx:447 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +msgid "of" +msgstr "" + #: ../html/src/manager/admin/list-payg/list-payg.tsx:186 msgid "Add Pay-as-you-go" msgstr "" @@ -1055,7 +1042,7 @@ msgstr "" msgid "Edit Information" msgstr "" -#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:56 +#: ../html/src/manager/admin/payg-shared/info/payg-info-edit.tsx:57 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-edit.tsx:85 msgid "Editing properties.." msgstr "" @@ -1068,7 +1055,7 @@ msgstr "" msgid "Edit " msgstr "" -#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:70 +#: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-edit.tsx:71 msgid "Editing ssh connection data.." msgstr "" @@ -1079,53 +1066,53 @@ msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:60 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:19 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:463 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:468 msgid "SSH Port" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:71 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:23 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:484 msgid "User" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:77 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:27 #: ../html/src/manager/images/image-store-edit.tsx:180 -#: ../html/src/manager/login/susemanager/login.tsx:90 +#: ../html/src/manager/login/susemanager/login.tsx:92 #: ../html/src/manager/login/uyuni/login.tsx:86 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:391 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:514 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:396 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:519 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:38 msgid "Password" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:80 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:33 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:408 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:526 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:413 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:531 msgid "SSH Private Key" msgstr "" #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-form.tsx:102 #: ../html/src/manager/admin/payg-shared/sshData/payg-ssh-data-view.tsx:39 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:420 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:425 msgid "SSH Private Key Passphrase" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:60 +#: ../html/src/manager/admin/payg/payg.tsx:61 msgid "The instance you are looking for does not exist or has been deleted" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:67 -msgid "Instance Hostname: {0}" +#: ../html/src/manager/admin/payg/payg.tsx:68 +msgid "Instance Hostname: {host}" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:76 +#: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" msgstr "" -#: ../html/src/manager/admin/payg/payg.tsx:79 +#: ../html/src/manager/admin/payg/payg.tsx:86 #: ../html/src/manager/content-management/project/project.tsx:119 msgid "Are you sure you want to delete project" msgstr "" @@ -1162,7 +1149,7 @@ msgstr "" #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:349 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:354 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:76 msgid "Details" msgstr "" @@ -1187,7 +1174,8 @@ msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:270 msgid "" -"The following channel installations for '{0}' failed. Please check log files." +"The following channel installations for '{product}' failed. Please check log " +"files." msgstr "" #: ../html/src/manager/admin/setup/products/products.tsx:319 @@ -1570,6 +1558,14 @@ msgstr "" msgid "Patch available but needs to be cloned into Channel." msgstr "" +#: ../html/src/manager/audit/cveaudit/cveaudit.tsx:403 +#: ../html/src/manager/content-management/list-filters/appstreams/select-input.tsx:34 +#: ../html/src/manager/content-management/list-filters/templates/app-streams.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:41 +#: ../html/src/manager/packages/list.tsx:102 +msgid "Channel" +msgstr "" + #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:404 msgid "Errata" msgstr "" @@ -1597,30 +1593,31 @@ msgstr "" msgid "You can also trigger a first run now by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:106 -msgid "Matching data is currently being recomputed, it was started {0}." +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 +msgid "" +"Matching data is currently being recomputed, it was started {timeFromNow}." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:113 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 msgid "" -"Latest successful match data was computed {0}, you can trigger a new run by " -"clicking the button below." +"Latest successful match data was computed {timeFromNow}, you can trigger a " +"new run by clicking the button below." msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:122 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" "Match data is computed via a task schedule, nightly by default (you can " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:124 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:128 msgid "change the task schedule from the administration page" msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:130 msgid "). " msgstr "" -#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:149 +#: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:153 msgid "Refresh matching data" msgstr "" @@ -2000,7 +1997,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/filter-form.tsx:154 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:164 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:106 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:105 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:50 #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 @@ -2156,7 +2153,7 @@ msgid "Last Build" msgstr "" #: ../html/src/manager/content-management/list-projects/list-projects.tsx:121 -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:42 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:40 msgid "Environment Lifecycle" msgstr "" @@ -2165,7 +2162,7 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:104 -msgid "Content Lifecycle Project - {0}" +msgid "Content Lifecycle Project - {name}" msgstr "" #: ../html/src/manager/content-management/project/project.tsx:116 @@ -2358,12 +2355,12 @@ msgstr "" msgid "disable all modules" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:64 -msgid "Build ({0})" +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 +msgid "Build ({count})" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:71 -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:134 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 #: ../html/src/manager/images/image-build.tsx:402 #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 @@ -2372,30 +2369,30 @@ msgstr "" msgid "Build" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:83 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:82 msgid "Build Project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:89 -msgid "Building project.." +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 +msgid "Building project" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:97 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" "The project contains channels with unsynchronized patches. They will be " "synchronized depending on your Organization settings." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:109 +#: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:108 msgid "Version Message" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -msgid "Version {0} history" +msgid "Version {version} history" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -msgid "Version {0} successfully built into {1}" +msgid "Version {version} successfully built into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 @@ -2416,34 +2413,34 @@ msgstr "" msgid "Insert before" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:43 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:41 msgid "Add Environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:54 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:52 msgid "Environment created successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:70 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:68 msgid "Creating the environment..." msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:86 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:84 msgid "No environments created" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:103 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:101 msgid "Environment updated successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:119 -msgid "Environment {0} deleted successfully" +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 +msgid "Environment {name} deleted successfully" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:143 +#: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" -"This environment cannot be deleted since it is being used in an {0}" -"autoinstallation distribution{1}." +"This environment cannot be deleted since it is being used in an " +"autoinstallation distribution." msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 @@ -2491,7 +2488,7 @@ msgid "Create New Filter" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -msgid "Edit Filter {0}" +msgid "Edit Filter {name}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 @@ -2528,7 +2525,7 @@ msgid "No version to promote or colliding environment build in progress" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:60 -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:113 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:116 msgid "Promote" msgstr "" @@ -2541,15 +2538,15 @@ msgid "Target environment" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:99 -msgid "Promote version {0} into {1}" +msgid "Promote version {version} into {environmentName}" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:114 +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:117 msgid "Promote environment" msgstr "" -#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:128 -msgid "Version {0} successfully promoted into {1}" +#: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:130 +msgid "Version {version} successfully promoted into {environmentName}" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/properties/properties-create.tsx:16 @@ -2667,7 +2664,7 @@ msgid "Page Not Found" msgstr "" #: ../html/src/manager/errors/not-found.tsx:8 -msgid "The page you requested, {0}, was not found." +msgid "The page you requested, {currentUrl}, was not found." msgstr "" #: ../html/src/manager/errors/not-found.tsx:12 @@ -2713,7 +2710,7 @@ msgstr "" #: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 #: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:140 +#: ../html/src/manager/state/highstate.tsx:142 msgid "Highstate" msgstr "" @@ -2743,7 +2740,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:14 #: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/systems/all-list.tsx:25 #: ../html/src/manager/systems/all-list.tsx:106 msgid "Packages" @@ -2751,7 +2748,7 @@ msgstr "" #: ../html/src/manager/header/search/search.tsx:18 #: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:789 +#: ../html/src/manager/images/image-view.tsx:788 #: ../html/src/manager/systems/all-list.tsx:24 #: ../html/src/manager/systems/all-list.tsx:93 msgid "Patches" @@ -2786,6 +2783,16 @@ msgstr "" msgid "Building the image has been " msgstr "" +#: ../html/src/manager/images/image-build.tsx:211 +#: ../html/src/manager/minion/ansible/schedule-playbook.tsx:178 +#: ../html/src/manager/minion/config-channels/minion-config-channels.tsx:31 +#: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 +#: ../html/src/manager/systems/proxy.tsx:70 +#: ../html/src/manager/systems/proxy.tsx:74 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +msgid "scheduled" +msgstr "" + #: ../html/src/manager/images/image-build.tsx:241 msgid "Profile Summary" msgstr "" @@ -2812,7 +2819,7 @@ msgstr "" #: ../html/src/manager/images/image-build.tsx:274 #: ../html/src/manager/images/image-import.tsx:229 #: ../html/src/manager/images/image-profile-edit.tsx:394 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:548 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" msgstr "" @@ -2875,7 +2882,7 @@ msgstr "" #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:380 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:385 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-edit.tsx:186 msgid "Clear fields" msgstr "" @@ -2981,9 +2988,10 @@ msgstr "" msgid "Are you sure you want to delete the selected profile?" msgstr "" -#: ../html/src/manager/images/image-profiles.tsx:245 +#: ../html/src/manager/images/image-profiles.tsx:244 msgid "" -"Are you sure you want to delete selected profiles? ({0} profiles selected)" +"Are you sure you want to delete selected profiles? ({count} profiles " +"selected)" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:165 @@ -2991,7 +2999,7 @@ msgid "Use credentials" msgstr "" #: ../html/src/manager/images/image-store-edit.tsx:171 -#: ../html/src/manager/login/susemanager/login.tsx:79 +#: ../html/src/manager/login/susemanager/login.tsx:81 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:170 #: ../html/src/manager/virtualization/pools/pool-properties.tsx:511 msgid "Username" @@ -3049,12 +3057,13 @@ msgstr "" msgid "Are you sure you want to delete the selected store?" msgstr "" -#: ../html/src/manager/images/image-stores.tsx:238 -msgid "Are you sure you want to delete selected stores? ({0} stores selected)" +#: ../html/src/manager/images/image-stores.tsx:237 +msgid "" +"Are you sure you want to delete selected stores? ({count} stores selected)" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:790 msgid "Build Log" msgstr "" @@ -3171,8 +3180,8 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:749 -msgid "Instance Details for '{0}'" +#: ../html/src/manager/images/image-view.tsx:748 +msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 @@ -3368,7 +3377,7 @@ msgid "Unknown" msgstr "" #: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:792 +#: ../html/src/manager/images/image-view.tsx:791 msgid "Runtime" msgstr "" @@ -3404,11 +3413,12 @@ msgstr "" msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:740 -msgid "Are you sure you want to delete selected images? ({0} images selected)" +#: ../html/src/manager/images/image-view.tsx:739 +msgid "" +"Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:788 +#: ../html/src/manager/images/image-view.tsx:787 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3454,12 +3464,12 @@ msgid "" "one interface." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:44 -msgid "_blank" +#: ../html/src/manager/login/susemanager/login.tsx:43 +msgid "Learn more about {product}." msgstr "" -#: ../html/src/manager/login/susemanager/login.tsx:78 -#: ../html/src/manager/login/susemanager/login.tsx:104 +#: ../html/src/manager/login/susemanager/login.tsx:80 +#: ../html/src/manager/login/susemanager/login.tsx:106 #: ../html/src/manager/login/uyuni/login.tsx:48 #: ../html/src/manager/login/uyuni/login.tsx:94 msgid "Sign In" @@ -3489,31 +3499,31 @@ msgstr "" msgid "Login" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:74 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:76 msgid "Skip to the last maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:78 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:80 msgid "Skip to the next maintenance window" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:118 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:120 msgid "There are no more past maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:152 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:154 msgid "There are no more future maintenance windows" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:320 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:321 msgid "Today" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:330 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:331 msgid "Month" msgstr "" -#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:334 +#: ../html/src/manager/maintenance/calendar/web-calendar.tsx:335 msgid "Day" msgstr "" @@ -3568,7 +3578,7 @@ msgid "Delete maintenance schedule" msgstr "" #: ../html/src/manager/maintenance/details/schedule-details.tsx:58 -#: ../html/src/manager/maintenance/details/schedule-details.tsx:168 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:170 msgid "Assigned Systems" msgstr "" @@ -3599,11 +3609,11 @@ msgstr "" msgid "Schedule Details" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:153 -msgid "Maintenance schedule has been assigned to {0} system(s)" +#: ../html/src/manager/maintenance/details/schedule-details.tsx:154 +msgid "Maintenance schedule has been assigned to {count} system(s)" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:172 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:174 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:131 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:114 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:14 @@ -3611,16 +3621,16 @@ msgstr "" msgid "Cancel affected actions" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:192 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:194 msgid "Search systems" msgstr "" -#: ../html/src/manager/maintenance/details/schedule-details.tsx:211 +#: ../html/src/manager/maintenance/details/schedule-details.tsx:213 msgid "Current Schedule" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:115 -msgid "Url '{0}' is invalid" +msgid "Url '{url}' is invalid" msgstr "" #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:135 @@ -3780,7 +3790,7 @@ msgid "Maintenance Schedules" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:21 -msgid "Assign a maintenance schedule to {0} system(s)" +msgid "Assign a maintenance schedule to {count} system(s)" msgstr "" #: ../html/src/manager/maintenance/ssm/system-assignment.tsx:22 @@ -3870,7 +3880,7 @@ msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:87 #: ../html/src/manager/recurring/recurring-actions-edit.tsx:184 -#: ../html/src/manager/state/highstate.tsx:119 +#: ../html/src/manager/state/highstate.tsx:121 msgid "Test mode" msgstr "" @@ -3883,7 +3893,7 @@ msgid "Schedule playbook execution" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:107 -msgid "Playbook '{0}'" +msgid "Playbook '{name}'" msgstr "" #: ../html/src/manager/minion/ansible/schedule-playbook.tsx:111 @@ -3976,6 +3986,15 @@ msgstr "" msgid "Package States" msgstr "" +#: ../html/src/manager/minion/packages/package-states.tsx:344 +#: ../html/src/manager/proxy/container-config.tsx:318 +#: ../html/src/manager/salt/keys/key-management.tsx:188 +#: ../html/src/manager/virtualization/guests/list/guests-list.tsx:154 +#: ../html/src/manager/virtualization/nets/list/nets-list.tsx:77 +#: ../html/src/manager/virtualization/pools/list/pools-list.tsx:340 +msgid "State" +msgstr "" + #: ../html/src/manager/minion/packages/use-package-states.api.tsx:37 msgid "Package states have been saved." msgstr "" @@ -4279,7 +4298,7 @@ msgid "Proxy SSH port" msgstr "" #: ../html/src/manager/proxy/container-config.tsx:218 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:474 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:479 msgid "Port range: 1 - 65535" msgstr "" @@ -4464,7 +4483,7 @@ msgid "Are you sure you want to delete this schedule?" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:239 -msgid "State configuration for {0}" +msgid "State configuration for {name}" msgstr "" #: ../html/src/manager/recurring/recurring-actions-details.tsx:246 @@ -4546,8 +4565,8 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions.tsx:148 msgid "" -"The below times are displayed in the server time zone {0}. The scheduled " -"time will be the server time." +"The below times are displayed in the server time zone {timeZone}. The " +"scheduled time will be the server time." msgstr "" #: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 @@ -4645,7 +4664,7 @@ msgid "No minions matched the target expression." msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:490 -msgid "Server returned an error: {0}" +msgid "Server returned an error: {message}" msgstr "" #: ../html/src/manager/salt/cmd/remote-commands.tsx:558 @@ -4729,7 +4748,7 @@ msgid "Manager" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:9 -msgid "State Summary for {0}" +msgid "State Summary for {name}" msgstr "" #: ../html/src/manager/state/display-highstate.tsx:79 @@ -4773,14 +4792,14 @@ msgid "System Group" msgstr "" #: ../html/src/manager/state/highstate.tsx:71 -msgid "Applying the highstate has been {0}." +msgid "Applying the highstate has been scheduled." msgstr "" -#: ../html/src/manager/state/highstate.tsx:127 +#: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" msgstr "" -#: ../html/src/manager/state/highstate.tsx:136 +#: ../html/src/manager/state/highstate.tsx:138 msgid "Create Recurring" msgstr "" @@ -4875,113 +4894,107 @@ msgid "" "check if your minion was bootstrapped correctly." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:334 -msgid "Successfully bootstrapped host! Your system should appear in" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:336 -msgid "systems" -msgstr "" - -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:338 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 msgid "" -"shortly. If it is a transactional system, please reboot it to finish " -"registration" +"Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:350 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:359 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 msgid "Unable to bootstrap host. The following errors have happened:" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:362 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:367 msgid "Your system is bootstrapping: waiting for a response.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:364 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:369 msgid "Loading SSH Private Key.." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:372 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 msgid "Bootstrap" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:398 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:403 msgid "e.g., ••••••••••••" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:414 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:419 msgid "" "The file will be stored in a temporary file on the server and will be " "deleted after the bootstrapping procedure" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:427 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:432 msgid "Leave empty for no passphrase" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:439 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:444 msgid "Bootstrap Minions" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:442 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:447 msgid "" -"You can add systems to be managed by providing SSH credentials only. {0} " -"will prepare the system remotely and will perform the registration." +"You can add systems to be managed by providing SSH credentials only. " +"{productName} will prepare the system remotely and will perform the " +"registration." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:456 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:461 msgid "e.g., host.domain.com" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:493 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:498 msgid "" "The user will have an effect only during the bootstrap process. Further " "connections will be made by the user specified in rhn.conf. The default user " -"for the key 'ssh_push_sudo_user' is 'root'. This user is set after {0}'s SSH " -"key is deployed during the bootstrap procedure." +"for the key 'ssh_push_sudo_user' is 'root'. This user is set after " +"{productName}'s SSH key is deployed during the bootstrap procedure." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:502 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:507 msgid "Authentication Method" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:539 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:544 msgid "Ansible control node" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:557 -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:587 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:562 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:592 #: ../html/src/manager/systems/proxy.tsx:124 msgid "None" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:570 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:575 msgid "Reactivation Key" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:576 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:581 msgid "Leave empty when no reactivation is wanted" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:605 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:610 msgid "" "The hostname of the proxy is not fully qualified. This may cause problems " "when accessing the channels." msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:622 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:627 msgid "Disable SSH strict host key checking during bootstrap process" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:638 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:643 msgid "Manage system completely via SSH (will not install an agent)" msgstr "" -#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:654 +#: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:659 msgid "" "Are you sure you want to close this page while bootstrapping is in progress ?" msgstr "" @@ -5389,11 +5402,7 @@ msgid "Nutanix AHV" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Virtual Host Manager" -msgstr "" - -#: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:155 -msgid "Add a {0}" +msgid "Add a {type} Virtual Host Manager" msgstr "" #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager.tsx:157 @@ -5415,7 +5424,7 @@ msgid "" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:162 -msgid "{0} selected" +msgid "{name} selected" msgstr "" #: ../html/src/manager/virtualization/ListTab.tsx:242 @@ -6349,17 +6358,3 @@ msgstr "" #: ../html/src/utils/network.ts:105 msgid "HTTP Error code " msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:5 -msgid "foo" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:6 -msgid "undefined" -msgstr "" - -#: ../html/src/utils/test-utils/setup/t.test.ts:11 -#: ../html/src/utils/test-utils/setup/t.test.ts:12 -#: ../html/src/utils/test-utils/setup/t.test.ts:13 -msgid "foo {0} tea {1}" -msgstr "" From 63050a6600a0156289893eece3eeeaa4010ddfff Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 28 Jul 2023 15:10:53 +0200 Subject: [PATCH 004/127] update strings for translations in spacecmd --- spacecmd/po/de.po | 2 +- spacecmd/po/es.po | 2 +- spacecmd/po/it.po | 2 +- spacecmd/po/ja.po | 2 +- spacecmd/po/ko.po | 2 +- spacecmd/po/pt.po | 2 +- spacecmd/po/pt_BR.po | 2 +- spacecmd/po/ru.po | 2 +- spacecmd/po/si.po | 2 +- spacecmd/po/sk.po | 6 +++--- spacecmd/po/spacecmd.pot | 2 +- spacecmd/po/zh_CN.po | 2 +- spacecmd/po/zh_HK.po | 2 +- spacecmd/po/zh_TW.po | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spacecmd/po/de.po b/spacecmd/po/de.po index 9bd151aa76d3..e08de44ecdad 100644 --- a/spacecmd/po/de.po +++ b/spacecmd/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-21 15:08+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2022-08-02 12:06+0000\n" "Last-Translator: Michael Calmer \n" "Language-Team: German \n" "Language-Team: Spanish \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Korean \n" "Language-Team: Portuguese (Brazil) \n" -"Language-Team: Slovak " -"\n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/spacecmd/po/spacecmd.pot b/spacecmd/po/spacecmd.pot index 50ea80132a2e..1b76e8767d50 100644 --- a/spacecmd/po/spacecmd.pot +++ b/spacecmd/po/spacecmd.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-21 15:08+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/spacecmd/po/zh_CN.po b/spacecmd/po/zh_CN.po index 58a62afd8c41..5735a69e5ba4 100644 --- a/spacecmd/po/zh_CN.po +++ b/spacecmd/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-21 15:08+0200\n" +"POT-Creation-Date: 2023-07-28 15:10+0200\n" "PO-Revision-Date: 2023-06-26 04:15+0000\n" "Last-Translator: Grace Yu \n" "Language-Team: Chinese (China) Date: Sat, 29 Jul 2023 15:04:16 +0000 Subject: [PATCH 005/127] Translated using Weblate (Slovak) Currently translated at 96.7% (1322 of 1366 strings) Translation: uyuni/web master Translate-URL: https://l10n.opensuse.org/projects/uyuni/web/sk/ --- web/po/sk.po | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/web/po/sk.po b/web/po/sk.po index 887e1968feef..646c61283d6f 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-28 15:10+0200\n" -"PO-Revision-Date: 2023-06-25 15:15+0000\n" +"PO-Revision-Date: 2023-07-29 17:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -134,9 +134,8 @@ msgstr "Nasledujúci rok" #. TODO: Here and below, this translation logic needs to be changed to whole sentences from parents #: ../html/src/components/dialog/ActionConfirm.tsx:72 -#, fuzzy msgid "Are you sure you want to {action} {name}" -msgstr "Naozaj chcete {0} {1} " +msgstr "Naozaj chcete {action} {name}" #: ../html/src/components/dialog/ActionConfirm.tsx:84 #, fuzzy @@ -282,15 +281,13 @@ msgstr "Žiadny druh" #: ../html/src/components/package/PackageListActionScheduler.tsx:82 #: ../html/src/manager/state/highstate.tsx:64 -#, fuzzy msgid "" "Action has been successfully added to the action chain '{name}'." -msgstr "Akcia bola úspešne pridaná do reťazca akcií '{0}'." +msgstr "Akcia bola úspešne pridaná do reťazca akcií '{name}'." #: ../html/src/components/package/PackageListActionScheduler.tsx:89 -#, fuzzy msgid "The action has been scheduled." -msgstr "Import obrazu bol naplánovaný." +msgstr "Akcia bola naplánovaná." #: ../html/src/components/package/PackageListActionScheduler.tsx:98 msgid "Unable to clear selection" @@ -2482,9 +2479,8 @@ msgid "Build Project" msgstr "Zostaviť projekt" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:88 -#, fuzzy msgid "Building project" -msgstr "Zostavuje sa projekt.." +msgstr "Zostavovanie projektu" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:96 msgid "" @@ -2552,13 +2548,12 @@ msgid "Environment {name} deleted successfully" msgstr "Prostredie {0} bolo úspešne vymazané" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 -#, fuzzy msgid "" "This environment cannot be deleted since it is being used in an " "autoinstallation distribution." msgstr "" -"Toto prostredie nemožno odstrániť, pretože sa používa v {0}distribúcii s " -"automatickou inštaláciou{1}." +"Toto prostredie nemožno odstrániť, pretože sa používa v distribúcii s " +"automatickou inštaláciou." #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:23 msgid "New" @@ -4987,9 +4982,8 @@ msgid "System Group" msgstr "Systémová skupina" #: ../html/src/manager/state/highstate.tsx:71 -#, fuzzy msgid "Applying the highstate has been scheduled." -msgstr "Použitie highstate bolo {0}." +msgstr "Použitie highstate bolo naplánované." #: ../html/src/manager/state/highstate.tsx:129 msgid "Apply Highstate" @@ -5095,13 +5089,14 @@ msgstr "" "Prosím, skontrolujte, či bol váš klient minion správne zavedený." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:335 -#, fuzzy msgid "" "Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish " "registration." msgstr "" -"krátko. Ak ide o transakčný systém, reštartujte ho a dokončite registráciu" +"Úspešne zavedený hostiteľ! krátko. Váš systém by sa mal čoskoro objaviť v " +"systémoch. Ak ide o transakčný systém, reštartujte ho a " +"dokončite registráciu." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:355 msgid "Show additional details about this error" From c848586608fbe6e5a8fb7bab4c67a53fb0b11790 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 1 Aug 2023 08:28:03 +1200 Subject: [PATCH 006/127] Increase waiting time during login and change to use has_selector --- testsuite/features/step_definitions/navigation_steps.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index ed095647bc65..06c30eb98579 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -553,7 +553,8 @@ Then(/^I should be logged in$/) do xpath_query = "//a[@href='/rhn/Logout.do']" - raise 'User is not logged in' unless find(:xpath, xpath_query) + # Check if the user is logged in, using the specified wait_time + raise 'User is not logged in' unless has_selector?(:xpath, xpath_query, wait: Capybara.default_max_wait_time * 2) end Then(/^I am logged in$/) do From c70b6e3bc1ef469bc9264b6b58a8350e2d890886 Mon Sep 17 00:00:00 2001 From: Ferdinand Galko Date: Mon, 31 Jul 2023 18:29:46 +0000 Subject: [PATCH 007/127] Translated using Weblate (Slovak) Currently translated at 97.0% (1326 of 1366 strings) Translation: uyuni/web master Translate-URL: https://l10n.opensuse.org/projects/uyuni/web/sk/ --- web/po/sk.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/web/po/sk.po b/web/po/sk.po index 646c61283d6f..9d237f67232e 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-28 15:10+0200\n" -"PO-Revision-Date: 2023-07-29 17:15+0000\n" +"PO-Revision-Date: 2023-07-31 21:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -45,14 +45,12 @@ msgid "Formula saved. Applying the highstate is not needed for this formula." msgstr "Vzorec bol uložený. Pre tento vzorec nie je potrebné použiť highstate." #: ../html/src/components/FormulaForm.tsx:168 -#, fuzzy msgid "Please input required fields: {fields}" -msgstr "Prosím, zadajte požadované polia: {0}" +msgstr "Prosím, zadajte požadované polia: {fields}" #: ../html/src/components/FormulaForm.tsx:171 -#, fuzzy msgid "Invalid format of fields: {fields}" -msgstr "Neplatný formát polí: {0}" +msgstr "Neplatný formát polí: {fields}" #: ../html/src/components/FormulaForm.tsx:216 msgid "" @@ -138,11 +136,12 @@ msgid "Are you sure you want to {action} {name}" msgstr "Naozaj chcete {action} {name}" #: ../html/src/components/dialog/ActionConfirm.tsx:84 -#, fuzzy msgid "" "Are you sure you want to {action} the selected {name}s? ({count} {name}s " "selected)" -msgstr "Naozaj chcete {0} vybrané položky {1}? ({2} položiek {1} vybraných)" +msgstr "" +"Naozaj chcete {action} vybrané položky {name}? ({count} položiek {name} " +"vybraných)" #: ../html/src/components/dialog/DangerDialog.tsx:61 #: ../html/src/components/dialog/DangerDialog.tsx:62 @@ -358,7 +357,7 @@ msgstr "Posledná" #: ../html/src/components/pagination.tsx:93 msgid "Page of {total}" -msgstr "" +msgstr "Stránka z {total}" #: ../html/src/components/pagination.tsx:115 #, fuzzy From ed2cd2beab9a3fd9335563732dfb69af10dad1dd Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Tue, 1 Aug 2023 07:25:09 +0000 Subject: [PATCH 008/127] Translated using Weblate (Macedonian) Currently translated at 6.7% (119 of 1770 strings) Translation: uyuni/java Translate-URL: https://l10n.opensuse.org/projects/uyuni/java/mk/ --- .../rhn/frontend/strings/java/StringResource_mk.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_mk.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_mk.xml index 65290597c339..f053111949aa 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_mk.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_mk.xml @@ -741,21 +741,21 @@ Management - + Управување Navigation Menu Manage - + Управа Navigation Menu Manage Repositories - + Управување на складишта Navigation Menu @@ -839,21 +839,21 @@ Transfer - + Трансфер Navigation Menu Packages - + Пакети Errata Details Navigation Tabs Package Search - + Пребарување на пакети Navigation Menu From 21f842c59a15a5fe18252f06bb69eb0bdf867834 Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Tue, 1 Aug 2023 07:26:38 +0000 Subject: [PATCH 009/127] Translated using Weblate (Macedonian) Currently translated at 16.8% (87 of 516 strings) Translation: uyuni/java database Translate-URL: https://l10n.opensuse.org/projects/uyuni/java-database/mk/ skip-checks: true --- .../rhn/frontend/strings/database/StringResource_mk.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_mk.xml b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_mk.xml index a1901103d142..e4b904498564 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_mk.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/database/StringResource_mk.xml @@ -526,7 +526,7 @@ Basic regular expression - + Основен правилен израз /rhn/systems/details/probes/ProbeEdit.do @@ -554,21 +554,21 @@ Critical 1 min - + Критично 1 мин /rhn/systems/details/probes/ProbeEdit.do Critical 15 min - + Критично 15 мин /rhn/systems/details/probes/ProbeEdit.do Critical 5 min - + Критично 5 мин /rhn/systems/details/probes/ProbeEdit.do From 0e49a36479dedc53b30a3092eb5ed47daf93bdde Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Wed, 2 Aug 2023 09:08:37 +1200 Subject: [PATCH 010/127] Create monitoring custom channel (#7332) * Add monitoring_server add MU to have a channel name different from parent channel and repositories --- ...dd_maintenance_update_repositories.feature | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 testsuite/features/build_validation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature diff --git a/testsuite/features/build_validation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature b/testsuite/features/build_validation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature new file mode 100644 index 000000000000..667d5ea4f6fe --- /dev/null +++ b/testsuite/features/build_validation/add_MU_repositories/monitoring_server_add_maintenance_update_repositories.feature @@ -0,0 +1,41 @@ +# Copyright (c) 2023 SUSE LLC +# Licensed under the terms of the MIT license. + +@monitoring_server +Feature: Add a Maintenance Update custom channel and the custom repositories for monitoring_server + + Scenario: Log in as admin user + Given I am authorized for the "Admin" section + + Scenario: Add the custom child channel for monitoring_server + When I follow the left menu "Software > Manage > Channels" + And I follow "Create Channel" + And I enter "Custom Channel for monitoring_server" as "Channel Name" + And I enter "custom_channel_monitoring_server" as "Channel Label" + And I select the parent channel for the "sle15sp4_minion" from "Parent Channel" + And I enter "Custom channel" as "Channel Summary" + And I click on "Create Channel" + Then I should see a "Channel Custom Channel for monitoring_server created" text + + Scenario: Add the Maintenance update repositories for sle15sp4_minion + When I create the MU repositories for "sle15sp4_minion" + + Scenario: Add the custom repositories to the custom channel for monitoring_server + When I follow the left menu "Software > Manage > Channels" + And I enter "monitoring_server" as the filtered channel name + And I click on the filter button + And I follow "Custom Channel for monitoring_server" + And I follow "Repositories" in the content area + And I select the MU repositories for "sle15sp4_minion" from the list + And I click on "Save Repositories" + Then I should see a "repository information was successfully updated" text + + Scenario: Synchronize the repositories in the custom channel for monitoring_server + When I follow the left menu "Software > Manage > Channels" + And I enter "monitoring_server" as the filtered channel name + And I click on the filter button + And I follow "Custom Channel for monitoring_server" + And I follow "Repositories" in the content area + And I follow "Sync" + And I click on "Sync Now" + Then I should see a "Repository sync scheduled" text or "No repositories are currently associated with this channel" text From 6275d5253efbd7ff7422fe576030b6622aa9c2e6 Mon Sep 17 00:00:00 2001 From: Welder Luz Date: Mon, 31 Jul 2023 09:06:21 -0300 Subject: [PATCH 011/127] refactor: reuse table filter component in recurring actions feature --- web/html/src/components/table/TableFilter.tsx | 52 +++++++++++++++++ ...ring-actions-search-action-type-filter.tsx | 22 -------- ...ring-actions-search-target-type-filter.tsx | 24 -------- .../search/recurring-actions-search-utils.tsx | 21 ++++--- .../search/recurring-actions-search.tsx | 56 +------------------ web/html/src/manager/systems/list-filter.tsx | 51 +---------------- 6 files changed, 67 insertions(+), 159 deletions(-) create mode 100644 web/html/src/components/table/TableFilter.tsx delete mode 100644 web/html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx delete mode 100644 web/html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx diff --git a/web/html/src/components/table/TableFilter.tsx b/web/html/src/components/table/TableFilter.tsx new file mode 100644 index 000000000000..90dd8a35dfbf --- /dev/null +++ b/web/html/src/components/table/TableFilter.tsx @@ -0,0 +1,52 @@ +import { useState } from "react"; + +import { Select } from "components/input"; +import { Form } from "components/input/Form"; +import { SelectSearchField } from "components/table/SelectSearchField"; + +const renderSearchField = (props) => { + const { field } = props; + const selectedOption = props.filterOptions.find((it) => it.value === field); + if (selectedOption?.filterOptions) { + return ; + } + return ( +
+ props.onSearch?.(e.target.value)} + name={props.name} + /> +
+ ); +}; + +export const TableFilter = (props) => { + // Dummy model and onChange to reuse the Select component as it requires a Form + let model = {}; + const onChange = () => {}; + + const [selectedFilter, setSelectedFilter] = useState(props.field || ""); + const handleChangeFilter = (value) => { + setSelectedFilter(value); + props.onSearchField?.(value); + }; + + return ( +
+
+ handleActionTypeChange(value)} - /> - ); -}; diff --git a/web/html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx b/web/html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx deleted file mode 100644 index 79b288066a4a..000000000000 --- a/web/html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { useState } from "react"; - -import { Select } from "components/input"; - -import { ALL_OPTION, TARGET_TYPE_OPTIONS } from "./recurring-actions-search-utils"; - -export const TargetTypeFilter = (props) => { - const [targetType, setTargetType] = useState(ALL_OPTION.value); - - const handleTargetTypeChange = (value) => { - setTargetType(value); - props.onSearch?.(value === ALL_OPTION.value ? "" : value); - }; - - return ( - props.onSearch?.(e.target.value)} - name={props.name} - /> -
- ); -}; +import { SEARCH_FIELD_OPTIONS } from "./recurring-actions-search-utils"; export const RecurringActionsSearch = (props) => { - // Dummy model and onChange to reuse the Select component as it requires a Form - let model = {}; - const onChange = () => {}; - - const [filterValue, setFilterValue] = useState(""); - const handleChangeSearchField = (value) => { - setFilterValue(value); - props.onSearchField?.(value); - }; - - return ( - -
- props.onSearch?.(e.target.value)} - name={props.name} - /> -
- ); -}; - export const SystemsListFilter = (props) => { - // Dummy model and onChange to reuse the Select component as it requires a Form - let model = {}; - const onChange = () => {}; - - const [filterValue, setFilterValue] = useState(props.field || ""); - const handleChangeSearchField = (value) => { - setFilterValue(value); - props.onSearchField?.(value); - }; - - return ( - -
- handleSearchValueChange(value)} /> ); diff --git a/web/html/src/components/table/TableFilter.tsx b/web/html/src/components/table/TableFilter.tsx index 90dd8a35dfbf..c7e224fdd921 100644 --- a/web/html/src/components/table/TableFilter.tsx +++ b/web/html/src/components/table/TableFilter.tsx @@ -4,21 +4,27 @@ import { Select } from "components/input"; import { Form } from "components/input/Form"; import { SelectSearchField } from "components/table/SelectSearchField"; -const renderSearchField = (props) => { - const { field } = props; - const selectedOption = props.filterOptions.find((it) => it.value === field); +const renderSearchField = ({ filterOptions, field, criteria, onSearch, placeholder, name }) => { + const selectedOption = filterOptions.find((it) => it.value === field); if (selectedOption?.filterOptions) { - return ; + return ( + + ); } return (
props.onSearch?.(e.target.value)} - name={props.name} + onChange={(e) => onSearch?.(e.target.value)} + name={name} />
); @@ -26,7 +32,7 @@ const renderSearchField = (props) => { export const TableFilter = (props) => { // Dummy model and onChange to reuse the Select component as it requires a Form - let model = {}; + const model = {}; const onChange = () => {}; const [selectedFilter, setSelectedFilter] = useState(props.field || ""); From 9d9c8c148e6614a76af08acbbb64f065667b7c06 Mon Sep 17 00:00:00 2001 From: Ferdinand Galko Date: Tue, 1 Aug 2023 19:09:22 +0000 Subject: [PATCH 013/127] Translated using Weblate (Slovak) Currently translated at 97.8% (1336 of 1366 strings) Translation: uyuni/web master Translate-URL: https://l10n.opensuse.org/projects/uyuni/web/sk/ --- web/po/sk.po | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/web/po/sk.po b/web/po/sk.po index 9d237f67232e..2c77c7dd4274 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-28 15:10+0200\n" -"PO-Revision-Date: 2023-07-31 21:15+0000\n" +"PO-Revision-Date: 2023-08-01 22:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -360,9 +360,8 @@ msgid "Page of {total}" msgstr "Stránka z {total}" #: ../html/src/components/pagination.tsx:115 -#, fuzzy msgid "Page {current} of {total}" -msgstr "Stránka {0} z {1}" +msgstr "Stránka {current} z {total}" #: ../html/src/components/picker/recurring-event-picker.tsx:49 msgid "Sunday" @@ -463,9 +462,8 @@ msgid "There are no entries to show." msgstr "Nie sú k dispozícii žiadne záznamy na zobrazenie." #: ../html/src/components/salt-state-popup.tsx:50 -#, fuzzy msgid "Configuration Channel: {name}" -msgstr "Konfiguračný kanál: {0}" +msgstr "Konfiguračný kanál: {name}" #: ../html/src/components/salt-state-popup.tsx:60 #: ../html/src/manager/images/image-profiles.tsx:204 @@ -544,9 +542,8 @@ msgid "Reorder" msgstr "Preusporiadať" #: ../html/src/components/states-picker.tsx:385 -#, fuzzy msgid "Search in states" -msgstr "Vyhľadať systémy" +msgstr "Hľadať v stavoch" #: ../html/src/components/states-picker.tsx:385 msgid "Search in configuration channels" @@ -561,24 +558,20 @@ msgid "Search" msgstr "Hľadať" #: ../html/src/components/states-picker.tsx:401 -#, fuzzy msgid "Edit State Ranks" -msgstr "Upraviť {0} poradia" +msgstr "Upraviť poradia stavov" #: ../html/src/components/states-picker.tsx:401 -#, fuzzy msgid "Edit Channel Ranks" -msgstr "Upraviť {0} poradia" +msgstr "Upraviť poradia kanálov" #: ../html/src/components/states-picker.tsx:404 -#, fuzzy msgid "Edit the ranking of the states by dragging them." -msgstr "Upraviť poradie {0} ich pretiahnutím." +msgstr "Upraviť poradie kanálov ich pretiahnutím." #: ../html/src/components/states-picker.tsx:405 -#, fuzzy msgid "Edit the ranking of the configuration channels by dragging them." -msgstr "Upraviť poradie {0} ich pretiahnutím." +msgstr "Upraviť poradie konfiguračných kanálov ich pretiahnutím." #: ../html/src/components/states-picker.tsx:410 msgid "There are no states assigned." @@ -669,14 +662,12 @@ msgid "Select a filter" msgstr "Vybrať filter" #: ../html/src/components/table/SearchPanel.tsx:57 -#, fuzzy msgid "Items {from} - {to} of {total}" -msgstr "Položky {0} - {1} z {2}" +msgstr "Položky {from} - {to} z {total}" #: ../html/src/components/table/SearchPanel.tsx:62 -#, fuzzy msgid "({selectedCount} selected)" -msgstr "Vymazať vybrané" +msgstr "({selectedCount} vybraných)" #: ../html/src/components/table/SearchPanel.tsx:64 #: ../html/src/manager/admin/setup/products/products.tsx:363 @@ -759,7 +750,7 @@ msgstr "nedefinované" #: ../html/src/core/intl/index.test.tsx:16 #: ../html/src/core/intl/index.test.tsx:17 msgid "foo {insert} bar" -msgstr "" +msgstr "foo {insert} panel" #: ../html/src/manager/admin/config/monitoring-admin.tsx:23 msgid "Restart is needed for the configuration changes to take effect." From c3aa9878e05f6f0e4e31e4086a8926f7cc85aaea Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Wed, 2 Aug 2023 08:24:00 +0200 Subject: [PATCH 014/127] be more specific in the filter to get less results --- testsuite/features/reposync/srv_sync_products.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/reposync/srv_sync_products.feature b/testsuite/features/reposync/srv_sync_products.feature index bd60660e9f74..96dac8582e87 100644 --- a/testsuite/features/reposync/srv_sync_products.feature +++ b/testsuite/features/reposync/srv_sync_products.feature @@ -16,7 +16,7 @@ Feature: Synchronize products in the products page of the Setup Wizard Scenario: Use the products and architecture filters When I follow the left menu "Admin > Setup Wizard > Products" And I wait until I do not see "Loading" text - And I enter "RHEL" as the filtered product description + And I enter "RHEL or SLES ES" as the filtered product description Then I should see a "RHEL or SLES ES or CentOS 8 Base" text When I select "x86_64" in the dropdown list of the architecture filter Then I should see a "RHEL or SLES ES or CentOS 8 Base" text From ecf5c9c6ef8816e0a0871330eb4a59a3fb47bace Mon Sep 17 00:00:00 2001 From: Victor Zhestkov Date: Wed, 2 Aug 2023 11:06:30 +0200 Subject: [PATCH 015/127] Do not build uyuni-base server subpackage for non relevant systems (#7166) --- ...ase.changes.vzhestkov.fix-uyuni-base-server-subpackage | 1 + uyuni/base/uyuni-base.spec | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 uyuni/base/uyuni-base.changes.vzhestkov.fix-uyuni-base-server-subpackage diff --git a/uyuni/base/uyuni-base.changes.vzhestkov.fix-uyuni-base-server-subpackage b/uyuni/base/uyuni-base.changes.vzhestkov.fix-uyuni-base-server-subpackage new file mode 100644 index 000000000000..e9f2527c1a70 --- /dev/null +++ b/uyuni/base/uyuni-base.changes.vzhestkov.fix-uyuni-base-server-subpackage @@ -0,0 +1 @@ +- Only build 'uyuni-base-server' package for server and not for client tools diff --git a/uyuni/base/uyuni-base.spec b/uyuni/base/uyuni-base.spec index 754032325b62..2ec5edee5301 100644 --- a/uyuni/base/uyuni-base.spec +++ b/uyuni/base/uyuni-base.spec @@ -60,7 +60,7 @@ Requires(pre): httpd %description common Basic filesystem hierarchy for Uyuni server and proxy. -%if ! (0%{?suse_version} == 1110) +%if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 %package server Summary: Base structure for Uyuni server Group: System/Fhs @@ -98,12 +98,12 @@ Basic filesystem hierarchy for Uyuni proxy. %install mkdir -p %{buildroot}/etc/rhn mkdir -p %{buildroot}/usr/share/rhn/proxy -%if ! (0%{?suse_version} == 1110) +%if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 mkdir -p %{buildroot}/var/spacewalk %endif mkdir -p %{buildroot}/%{_prefix}/share/rhn/config-defaults -%if !(0%{?suse_version} == 1110) +%if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 %pre server getent group susemanager >/dev/null || %{_sbindir}/groupadd -r susemanager getent passwd salt >/dev/null && %{_sbindir}/usermod -a -G susemanager salt @@ -119,7 +119,7 @@ getent passwd %{apache_user} >/dev/null && %{_sbindir}/usermod -a -G susemanager %dir %{_prefix}/share/rhn %dir %attr(755,root,%{apache_group}) %{_prefix}/share/rhn/config-defaults -%if ! (0%{?suse_version} == 1110) +%if 0%{?suse_version} >= 1500 || 0%{?rhel} >= 9 %files server %defattr(-,root,root) %dir %attr(755,%{apache_user}, root) /var/spacewalk From 2a96002cc970d2de2eeb0da4169dbb320007bdc9 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Wed, 2 Aug 2023 14:40:09 +0200 Subject: [PATCH 016/127] Replace steps that use systems filter to navigate to minions (#7339) --- .../retail/sle12sp5_terminal_deploy.feature | 2 +- .../retail/sle15sp4_terminal_deploy.feature | 2 +- testsuite/features/init_clients/sle_minion.feature | 2 +- .../features/secondary/proxy_cobbler_pxeboot.feature | 2 +- .../proxy_retail_pxeboot_and_mass_import.feature | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature b/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature index d788c358c2e6..f2a2ce9115a2 100644 --- a/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature +++ b/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature @@ -27,7 +27,7 @@ Feature: PXE boot a SLES 12 SP5 retail terminal Then "sle12sp5_terminal" should have been reformatted Scenario: Check connection from SLES 12 SP5 retail terminal to branch server - Given I navigate to the Systems overview page of this "sle12sp5_terminal" + Given I am on the Systems overview page of this "sle12sp5_terminal" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature b/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature index 4b35e96ff32b..3daff2b67dd3 100644 --- a/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature +++ b/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature @@ -27,7 +27,7 @@ Feature: PXE boot a SLES 15 SP4 retail terminal Then "sle15sp4_terminal" should have been reformatted Scenario: Check connection from SLES 15 SP4 retail terminal to branch server - Given I navigate to the Systems overview page of this "sle15sp4_terminal" + Given I am on the Systems overview page of this "sle15sp4_terminal" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/init_clients/sle_minion.feature b/testsuite/features/init_clients/sle_minion.feature index e1d671237a81..dd383040a206 100644 --- a/testsuite/features/init_clients/sle_minion.feature +++ b/testsuite/features/init_clients/sle_minion.feature @@ -30,7 +30,7 @@ Feature: Bootstrap a Salt minion via the GUI @proxy Scenario: Check connection from minion to proxy - Given I navigate to the Systems overview page of this "sle_minion" + Given I am on the Systems overview page of this "sle_minion" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see "proxy" short hostname diff --git a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature index 2c26453cac9c..63e7ad10bfb9 100644 --- a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature +++ b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature @@ -141,7 +141,7 @@ Feature: PXE boot a terminal with Cobbler And I wait for "tftpboot-installation-SLE-15-SP4-x86_64" to be uninstalled on "server" Scenario: Cleanup: delete the PXE boot minion - Given I navigate to the Systems overview page of this "pxeboot_minion" + Given I am on the Systems overview page of this "pxeboot_minion" When I follow "Delete System" Then I should see a "Confirm System Profile Deletion" text When I click on "Delete Profile" diff --git a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature index 119bb20f4d7d..2633d7894adc 100644 --- a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature +++ b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature @@ -203,13 +203,13 @@ Feature: PXE boot a Retail terminal Then "pxeboot_minion" should have been reformatted Scenario: Check connection from terminal to branch server - Given I navigate to the Systems overview page of this "pxeboot_minion" + Given I am on the Systems overview page of this "pxeboot_minion" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text Scenario: Install a package on the new Retail terminal - Given I navigate to the Systems overview page of this "pxeboot_minion" + Given I am on the Systems overview page of this "pxeboot_minion" When I install the GPG key of the test packages repository on the PXE boot minion And I follow "Software" in the content area And I follow "Install" @@ -222,7 +222,7 @@ Feature: PXE boot a Retail terminal When I wait until event "Package Install/Upgrade scheduled by admin" is completed Scenario: Cleanup: remove a package on the new Retail terminal - Given I navigate to the Systems overview page of this "pxeboot_minion" + Given I am on the Systems overview page of this "pxeboot_minion" When I follow "Software" in the content area And I follow "List / Remove" And I enter "virgo" as the filtered package name @@ -234,7 +234,7 @@ Feature: PXE boot a Retail terminal When I wait until event "Package Removal scheduled by admin" is completed Scenario: Cleanup: delete the new Retail terminal - Given I navigate to the Systems overview page of this "pxeboot_minion" + Given I am on the Systems overview page of this "pxeboot_minion" When I follow "Delete System" Then I should see a "Confirm System Profile Deletion" text When I click on "Delete Profile" From d986af86e145aa23bf7374448100885cee78b20f Mon Sep 17 00:00:00 2001 From: Welder Luz Date: Wed, 2 Aug 2023 10:45:08 -0300 Subject: [PATCH 017/127] Add search field name to fix testsuite --- web/html/src/manager/systems/list-filter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/src/manager/systems/list-filter.tsx b/web/html/src/manager/systems/list-filter.tsx index 7a833e8dc088..2a363ffa1007 100644 --- a/web/html/src/manager/systems/list-filter.tsx +++ b/web/html/src/manager/systems/list-filter.tsx @@ -53,5 +53,5 @@ const allListOptions = [ ]; export const SystemsListFilter = (props) => { - return ; + return ; }; From 48225fd4a53aa5619f99e60b53c6f8495982171f Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Wed, 2 Aug 2023 16:28:40 +0200 Subject: [PATCH 018/127] Move repository creation and sync to reposync (#7342) --- testsuite/features/core/srv_channels_add.feature | 2 +- .../features/{core => reposync}/srv_create_repository.feature | 0 testsuite/run_sets/core.yml | 1 - testsuite/run_sets/refhost.yml | 2 +- testsuite/run_sets/reposync.yml | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) rename testsuite/features/{core => reposync}/srv_create_repository.feature (100%) diff --git a/testsuite/features/core/srv_channels_add.feature b/testsuite/features/core/srv_channels_add.feature index 20a94fc833b6..2baa076144c8 100644 --- a/testsuite/features/core/srv_channels_add.feature +++ b/testsuite/features/core/srv_channels_add.feature @@ -3,7 +3,7 @@ # # This feature can cause failures in: # - features/core/srv_create_activationkey.feature -# - features/core/srv_create_repository.feature +# - features/reposync/srv_create_repository.feature # - features/init_client/sle_minion.feature # - features/init_client/sle_ssh_minion.feature # - features/init_client/min_rhlike.feature diff --git a/testsuite/features/core/srv_create_repository.feature b/testsuite/features/reposync/srv_create_repository.feature similarity index 100% rename from testsuite/features/core/srv_create_repository.feature rename to testsuite/features/reposync/srv_create_repository.feature diff --git a/testsuite/run_sets/core.yml b/testsuite/run_sets/core.yml index d070bb84b3bd..f2cf12da8911 100644 --- a/testsuite/run_sets/core.yml +++ b/testsuite/run_sets/core.yml @@ -14,7 +14,6 @@ - features/core/srv_organization_credentials.feature - features/core/srv_user_preferences.feature - features/core/srv_channels_add.feature -- features/core/srv_create_repository.feature - features/core/srv_create_activationkey.feature - features/core/srv_osimage.feature - features/core/srv_docker.feature diff --git a/testsuite/run_sets/refhost.yml b/testsuite/run_sets/refhost.yml index cd09326b7421..02ee8f32dd25 100644 --- a/testsuite/run_sets/refhost.yml +++ b/testsuite/run_sets/refhost.yml @@ -12,7 +12,7 @@ - features/core/allcli_sanity.feature - features/core/srv_first_settings.feature - features/core/srv_channels_add.feature -- features/core/srv_create_repository.feature +- features/reposync/srv_create_repository.feature - features/core/srv_create_activationkey.feature - features/core/srv_docker.feature diff --git a/testsuite/run_sets/reposync.yml b/testsuite/run_sets/reposync.yml index 87664f936ab5..a6423908d0c9 100644 --- a/testsuite/run_sets/reposync.yml +++ b/testsuite/run_sets/reposync.yml @@ -13,5 +13,6 @@ - features/reposync/srv_sync_products.feature - features/reposync/srv_enable_sync_products.feature - features/reposync/srv_wait_for_reposync.feature +- features/reposync/srv_create_repository.feature ## Channels and Product synchronization features END ### From 4ddb91e058aaf8d3904623e6763462d8884f191e Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Thu, 3 Aug 2023 10:20:15 +0200 Subject: [PATCH 019/127] Skip swap creation and btrfs check when we have overlayfs (#7333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cédric Bosdonnat --- susemanager/bin/mgr-setup | 78 ++++++++++--------- ...manager.changes.mbussolotto.ignore_overlay | 1 + 2 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 susemanager/susemanager.changes.mbussolotto.ignore_overlay diff --git a/susemanager/bin/mgr-setup b/susemanager/bin/mgr-setup index 3f4f6384d349..de70bacd0ecd 100755 --- a/susemanager/bin/mgr-setup +++ b/susemanager/bin/mgr-setup @@ -129,8 +129,11 @@ if [ $SWAP -eq 0 ]; then echo "Not enough space on /. Not adding swap space. Good luck..." else FSTYPE=`df -T / | tail -1 | awk '{print $2}'` + # Ignore for overlay too if [ $FSTYPE == "btrfs" ]; then echo "Will *NOT* create swapfile on btrfs. Make sure you have enough RAM!" + elif [ $FSTYPE == "overlay" ]; then + echo "Will *NOT* create swapfile in a container!" else if [ -f /SWAPFILE ]; then swapoff /SWAPFILE @@ -316,47 +319,52 @@ check_mksubvolume() { } check_btrfs_dirs() { -DIR="/var/spacewalk" -if [ ! -d $DIR ]; then - FSTYPE=`df -T \`dirname $DIR\` | tail -1 | awk '{print $2}'` - echo -n "Filesystem type for $DIR is $FSTYPE - " - if [ $FSTYPE == "btrfs" ]; then - check_mksubvolume - echo "creating nCoW subvolume." - mksubvolume --nocow $DIR +ROOT_FSTYPE=`df -T / | tail -1 | awk '{print $2}'` +if [ $ROOT_FSTYPE == "overlay" ]; then + echo "Skipping btrfs check in containers" +else + DIR="/var/spacewalk" + if [ ! -d $DIR ]; then + FSTYPE=`df -T \`dirname $DIR\` | tail -1 | awk '{print $2}'` + echo -n "Filesystem type for $DIR is $FSTYPE - " + if [ $FSTYPE == "btrfs" ]; then + check_mksubvolume + echo "creating nCoW subvolume." + mksubvolume --nocow $DIR + else + echo "ok." + fi else - echo "ok." + echo "$DIR already exists. Leaving it untouched." fi -else - echo "$DIR already exists. Leaving it untouched." -fi -DIR="/var/cache" -if [ ! -d $DIR ]; then - mkdir $DIR -fi -FSTYPE=`df -T $DIR | tail -1 | awk '{print $2}'` -echo -n "Filesystem type for $DIR is $FSTYPE - " -if [ $FSTYPE == "btrfs" ]; then - TESTDIR=`basename $DIR` - btrfs subvolume list /var | grep "$TESTDIR" > /dev/null - if [ ! $? -eq 0 ]; then - check_mksubvolume - echo "creating subvolume." - mv $DIR ${DIR}.sav - mksubvolume $DIR - touch ${DIR}.sav/foobar.dummy - if [ ! -d $DIR ]; then - mkdir $DIR + DIR="/var/cache" + if [ ! -d $DIR ]; then + mkdir $DIR + fi + FSTYPE=`df -T $DIR | tail -1 | awk '{print $2}'` + echo -n "Filesystem type for $DIR is $FSTYPE - " + if [ $FSTYPE == "btrfs" ]; then + TESTDIR=`basename $DIR` + btrfs subvolume list /var | grep "$TESTDIR" > /dev/null + if [ ! $? -eq 0 ]; then + check_mksubvolume + echo "creating subvolume." + mv $DIR ${DIR}.sav + mksubvolume $DIR + touch ${DIR}.sav/foobar.dummy + if [ ! -d $DIR ]; then + mkdir $DIR + fi + mv ${DIR}.sav/* $DIR + rmdir ${DIR}.sav + rm -f $DIR/foobar.dummy + else + echo "subvolume for $DIR already exists. Fine." fi - mv ${DIR}.sav/* $DIR - rmdir ${DIR}.sav - rm -f $DIR/foobar.dummy else - echo "subvolume for $DIR already exists. Fine." + echo "ok." fi -else - echo "ok." fi } diff --git a/susemanager/susemanager.changes.mbussolotto.ignore_overlay b/susemanager/susemanager.changes.mbussolotto.ignore_overlay new file mode 100644 index 000000000000..fa22552a5eb1 --- /dev/null +++ b/susemanager/susemanager.changes.mbussolotto.ignore_overlay @@ -0,0 +1 @@ +- Skip swap creation and BTRFS check when we have overlayfs From 5a33b1446e393e569fe132d1abfbfd4661e3e0f0 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Thu, 3 Aug 2023 13:59:21 +0200 Subject: [PATCH 020/127] Use the systems filter to find the minion (#7351) --- .../features/secondary/allcli_overview_systems_details.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/secondary/allcli_overview_systems_details.feature b/testsuite/features/secondary/allcli_overview_systems_details.feature index 824896707ab7..7170e6b4036f 100644 --- a/testsuite/features/secondary/allcli_overview_systems_details.feature +++ b/testsuite/features/secondary/allcli_overview_systems_details.feature @@ -8,7 +8,7 @@ Feature: The system details of each minion and client provides an overview of th Given I am authorized for the "Admin" section @sle_minion Scenario: SLE minion hardware refresh - Given I am on the Systems overview page of this "sle_minion" + Given I navigate to the Systems overview page of this "sle_minion" When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text From 2f3a9780974125398a533804389660e7a3a321a3 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Thu, 3 Aug 2023 17:15:28 +0200 Subject: [PATCH 021/127] QE: Use Leap instead of SLES in the Uyuni CI (#7029) --- .../allcli_update_activationkeys.feature | 97 +++++++++++++++---- .../init_clients/buildhost_bootstrap.feature | 6 +- .../proxy_register_as_minion_with_gui.feature | 24 ++++- ...oxy_register_as_minion_with_script.feature | 24 ++++- .../init_clients/sle_ssh_minion.feature | 4 +- .../reposync/srv_enable_sync_products.feature | 7 ++ .../reposync/srv_sync_channels.feature | 3 + .../reposync/srv_sync_products.feature | 28 +----- .../reposync/srv_wait_for_reposync.feature | 6 +- .../step_definitions/command_steps.rb | 4 + testsuite/features/support/commonlib.rb | 2 +- testsuite/features/support/constants.rb | 13 ++- 12 files changed, 163 insertions(+), 55 deletions(-) diff --git a/testsuite/features/init_clients/allcli_update_activationkeys.feature b/testsuite/features/init_clients/allcli_update_activationkeys.feature index 654aa8a82604..a14bc78b6146 100644 --- a/testsuite/features/init_clients/allcli_update_activationkeys.feature +++ b/testsuite/features/init_clients/allcli_update_activationkeys.feature @@ -43,8 +43,10 @@ Feature: Update activation keys Then I should see a "Repository sync scheduled for Fake-RPM-SUSE-Channel." text And I wait until the channel "fake-rpm-suse-channel" has been synced And I disable source package syncing - + +@skip_if_github_validation @scc_credentials +@susemanager Scenario: Update SLE key with synced base product When I follow the left menu "Systems > Activation Keys" And I follow "SUSE Test Key x86_64" in the content area @@ -66,7 +68,27 @@ Feature: Update activation keys When I click on "Update Activation Key" Then I should see a "Activation key SUSE Test Key x86_64 has been modified" text +@skip_if_github_validation +@uyuni + Scenario: Update openSUSE Leap key with synced base product + When I follow the left menu "Systems > Activation Keys" + And I follow "SUSE Test Key x86_64" in the content area + And I wait until I do not see "Loading..." text + And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Fake-RPM-SUSE-Channel" + When I click on "Update Activation Key" + Then I should see a "Activation key SUSE Test Key x86_64 has been modified" text + +@skip_if_github_validation @scc_credentials +@susemanager Scenario: Update SSH key with synced base product When I follow the left menu "Systems > Activation Keys" And I follow "SUSE SSH Test Key x86_64" in the content area @@ -79,7 +101,27 @@ Feature: Update activation keys And I click on "Update Activation Key" Then I should see a "Activation key SUSE SSH Test Key x86_64 has been modified" text +@skip_if_github_validation +@uyuni + Scenario: Update SSH key with synced base product + When I follow the left menu "Systems > Activation Keys" + And I follow "SUSE SSH Test Key x86_64" in the content area + And I wait until I do not see "Loading..." text + And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Fake-RPM-SUSE-Channel" + And I click on "Update Activation Key" + Then I should see a "Activation key SUSE SSH Test Key x86_64 has been modified" text + +@skip_if_github_validation @scc_credentials +@susemanager Scenario: Update SSH tunnel key with synced base product When I follow the left menu "Systems > Activation Keys" And I follow "SUSE SSH Tunnel Test Key x86_64" in the content area @@ -92,6 +134,25 @@ Feature: Update activation keys And I click on "Update Activation Key" Then I should see a "Activation key SUSE SSH Tunnel Test Key x86_64 has been modified" text +@skip_if_github_validation +@uyuni + Scenario: Update SSH tunnel key with synced base product + When I follow the left menu "Systems > Activation Keys" + And I follow "SUSE SSH Tunnel Test Key x86_64" in the content area + And I wait until I do not see "Loading..." text + And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Fake-RPM-SUSE-Channel" + And I click on "Update Activation Key" + Then I should see a "Activation key SUSE SSH Tunnel Test Key x86_64 has been modified" text + +@skip_if_github_validation @scc_credentials @susemanager Scenario: Update the Proxy key with synced base product @@ -110,20 +171,20 @@ Feature: Update activation keys When I click on "Update Activation Key" Then I should see a "Activation key Proxy Key x86_64 has been modified" text -# This will be enabled once the Uyuni CI is syncing openSUSE Leap 15.4 -# @uyuni -# Scenario: Update the Proxy key with synced base product -# When I follow the left menu "Systems > Activation Keys" -# And I follow "Proxy Key x86_64" in the content area -# And I wait until I do not see "Loading..." text -# And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel" -# And I wait until I do not see "Loading..." text -# And I check "openSUSE 15.4 non oss (x86_64)" -# And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" -# And I check "openSUSE Leap 15.4 Updates (x86_64)" -# And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" -# And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" -# And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" -# And I check "Uyuni Proxy Stable for openSUSE Leap 15.4 (x86_64)" -# When I click on "Update Activation Key" -# Then I should see a "Activation key Proxy Key x86_64 has been modified" text +@skip_if_github_validation +@uyuni + Scenario: Update the Proxy key with synced base product + When I follow the left menu "Systems > Activation Keys" + And I follow "Proxy Key x86_64" in the content area + And I wait until I do not see "Loading..." text + And I select "openSUSE Leap 15.4 (x86_64)" from "selectedBaseChannel" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)" + When I click on "Update Activation Key" + Then I should see a "Activation key Proxy Key x86_64 has been modified" text diff --git a/testsuite/features/init_clients/buildhost_bootstrap.feature b/testsuite/features/init_clients/buildhost_bootstrap.feature index e390a391c084..9ce14e158af5 100644 --- a/testsuite/features/init_clients/buildhost_bootstrap.feature +++ b/testsuite/features/init_clients/buildhost_bootstrap.feature @@ -1,8 +1,8 @@ -# Copyright (c) 2016-2022 SUSE LLC +# Copyright (c) 2016-2023 SUSE LLC # Licensed under the terms of the MIT license. @buildhost -Feature: Bootstrap a Salt build host via the GUI +Feature: Bootstrap a build host via the GUI Scenario: Log in as admin user Given I am authorized for the "Admin" section @@ -15,7 +15,7 @@ Feature: Bootstrap a Salt build host via the GUI And I check "osimage_build_host" And I click on "Update Activation Key" - Scenario: Bootstrap a SLES build host + Scenario: Bootstrap a build host When I follow the left menu "Systems > Bootstrapping" Then I should see a "Bootstrap Minions" text When I enter the hostname of "build_host" as "hostname" diff --git a/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature b/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature index fb7a9278ae83..db15c9fd345d 100644 --- a/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature +++ b/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2022 SUSE LLC +# Copyright (c) 2017-2023 SUSE LLC # Licensed under the terms of the MIT license. # # The scenarios in this feature are skipped if there is no proxy @@ -63,3 +63,25 @@ Feature: Setup Uyuni proxy Scenario: Check events history for failures on the proxy Given I am on the Systems overview page of this "proxy" Then I check for failed events on history event page + +@uyuni + Scenario: Assign the correct channels to the proxy + Given I am on the Systems overview page of this "proxy" + When I follow "Software" in the content area + And I follow "Software Channels" in the content area + And I wait until I do not see "Loading..." text + And I check radio button "openSUSE Leap 15.4 (x86_64)" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)" + And I click on "Next" + Then I should see a "Confirm Software Channel Change" text + When I click on "Confirm" + Then I should see a "Changing the channels has been scheduled." text + When I follow "scheduled" in the content area + And I wait until I see "1 system successfully completed this action." text, refreshing the page diff --git a/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature b/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature index 178dc8d8a53b..bf299a016091 100644 --- a/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature +++ b/testsuite/features/init_clients/proxy_register_as_minion_with_script.feature @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2022 SUSE LLC +# Copyright (c) 2017-2023 SUSE LLC # Licensed under the terms of the MIT license. # # The scenarios in this feature are skipped if there is no proxy @@ -73,3 +73,25 @@ Feature: Setup Uyuni proxy Scenario: Cleanup: remove proxy bootstrap scripts When I run "rm /srv/www/htdocs/pub/bootstrap/bootstrap-proxy.sh" on "server" And I run "rm /root/bootstrap-proxy.sh" on "proxy" + +@uyuni + Scenario: Assign the correct channels to the proxy + Given I am on the Systems overview page of this "proxy" + When I follow "Software" in the content area + And I follow "Software Channels" in the content area + And I wait until I do not see "Loading..." text + And I check radio button "openSUSE Leap 15.4 (x86_64)" + And I wait until I do not see "Loading..." text + And I check "openSUSE 15.4 non oss (x86_64)" + And I check "openSUSE Leap 15.4 non oss Updates (x86_64)" + And I check "openSUSE Leap 15.4 Updates (x86_64)" + And I check "Update repository of openSUSE Leap 15.4 Backports (x86_64)" + And I check "Update repository with updates from SUSE Linux Enterprise 15 for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Client Tools for openSUSE Leap 15.4 (x86_64)" + And I check "Uyuni Proxy Devel for openSUSE Leap 15.4 (x86_64) (Development)" + And I click on "Next" + Then I should see a "Confirm Software Channel Change" text + When I click on "Confirm" + Then I should see a "Changing the channels has been scheduled." text + When I follow "scheduled" in the content area + And I wait until I see "1 system successfully completed this action." text, refreshing the page diff --git a/testsuite/features/init_clients/sle_ssh_minion.feature b/testsuite/features/init_clients/sle_ssh_minion.feature index 1adf21685c8d..dc98f1c91739 100644 --- a/testsuite/features/init_clients/sle_ssh_minion.feature +++ b/testsuite/features/init_clients/sle_ssh_minion.feature @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2022 SUSE LLC +# Copyright (c) 2016-2023 SUSE LLC # Licensed under the terms of the MIT license. @ssh_minion @@ -7,7 +7,7 @@ Feature: Bootstrap a Salt host managed via salt-ssh Scenario: Log in as admin user Given I am authorized for the "Admin" section - Scenario: Register this SSH minion for service pack migration + Scenario: Bootstrap a SLES SSH minion When I follow the left menu "Systems > Bootstrapping" Then I should see a "Bootstrap Minions" text When I check "manageWithSSH" diff --git a/testsuite/features/reposync/srv_enable_sync_products.feature b/testsuite/features/reposync/srv_enable_sync_products.feature index 4176f44b41f8..f264c30c906f 100644 --- a/testsuite/features/reposync/srv_enable_sync_products.feature +++ b/testsuite/features/reposync/srv_enable_sync_products.feature @@ -6,10 +6,17 @@ Feature: Be able to list available products and enable them As root user I want to be able to list available products and enable them +@susemanager Scenario: List available products When I execute mgr-sync "list products" with user "admin" and password "admin" Then I should get "[ ] SUSE Linux Enterprise Desktop 15 SP3 x86_64" +@uyuni + Scenario: List available products + When I execute mgr-sync "list products" with user "admin" and password "admin" + Then I should get "[ ] openSUSE Leap 15.4 x86_64" + +@susemanager Scenario: List all available products When I execute mgr-sync "list products -e" Then I should get "[ ] SUSE Linux Enterprise Desktop 15 SP3 x86_64" diff --git a/testsuite/features/reposync/srv_sync_channels.feature b/testsuite/features/reposync/srv_sync_channels.feature index d8360f5b0978..f2de2353061b 100644 --- a/testsuite/features/reposync/srv_sync_channels.feature +++ b/testsuite/features/reposync/srv_sync_channels.feature @@ -7,6 +7,7 @@ Feature: Be able to list available channels and enable them As root user I want to be able to list available channels and enable them +@susemanager Scenario: List available channels # Order matters here, refresh first When I refresh SCC @@ -15,6 +16,7 @@ Feature: Be able to list available channels and enable them And I should get " [ ] SLE-Product-SLES15-SP4-Updates for x86_64 SUSE Linux Enterprise Server 15 SP4 x86_64 [sle-product-sles15-sp4-updates-x86_64]" And I should get " [ ] SLE15-SP4-Installer-Updates for x86_64 SUSE Linux Enterprise Server 15 SP4 x86_64 [sle15-sp4-installer-updates-x86_64]" +@susemanager Scenario: List available mandatory channels When I execute mgr-sync "list channels -e --no-optional" Then I should get "[ ] SLE-Product-SLES15-SP4-Pool for x86_64 SUSE Linux Enterprise Server 15 SP4 x86_64 [sle-product-sles15-sp4-pool-x86_64]" @@ -35,6 +37,7 @@ Feature: Be able to list available channels and enable them And I should get " [ ] (R) SUSE Manager Client Tools for RHEL, Liberty and Clones 7 x86_64" And I should get " [ ] (R) SUSE Manager Client Tools for SLE 15 x86_64" +@susemanager Scenario: List products with filter When I execute mgr-sync "list products --expand --filter x86_64" Then I should get "[ ] SUSE Linux Enterprise Server 15 SP4 x86_64" diff --git a/testsuite/features/reposync/srv_sync_products.feature b/testsuite/features/reposync/srv_sync_products.feature index 96dac8582e87..8d27cdf2e501 100644 --- a/testsuite/features/reposync/srv_sync_products.feature +++ b/testsuite/features/reposync/srv_sync_products.feature @@ -22,6 +22,7 @@ Feature: Synchronize products in the products page of the Setup Wizard Then I should see a "RHEL or SLES ES or CentOS 8 Base" text @scc_credentials +@susemanager Scenario: View the channels list in the products page When I follow the left menu "Admin > Setup Wizard > Products" And I wait until I do not see "Loading" text @@ -61,31 +62,9 @@ Feature: Synchronize products in the products page of the Setup Wizard And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added Then the SLE15 SP4 product should be added -@scc_credentials @uyuni - Scenario: Add SLES 15 SP4 product with recommended sub-products - When I follow the left menu "Admin > Setup Wizard > Products" - And I wait until I do not see "Loading" text - And I enter "SUSE Linux Enterprise Server 15 SP4" as the filtered product description - And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" text - And I open the sub-list of the product "SUSE Linux Enterprise Server 15 SP4 x86_64" - And I open the sub-list of the product "Basesystem Module 15 SP4 x86_64" - And I open the sub-list of the product "Desktop Applications Module 15 SP4 x86_64" - Then I should see that the "Basesystem Module 15 SP4 x86_64" product is "recommended" - And I should see that the "Server Applications Module 15 SP4 x86_64" product is "recommended" - When I select "SUSE Linux Enterprise Server 15 SP4 x86_64" as a product - Then I should see the "SUSE Linux Enterprise Server 15 SP4 x86_64" selected - And I should see the "Basesystem Module 15 SP4 x86_64" selected - And I should see the "Server Applications Module 15 SP4 x86_64" selected - When I select "Desktop Applications Module 15 SP4 x86_64" as a product - And I select "Development Tools Module 15 SP4 x86_64" as a product - Then I should see the "Desktop Applications Module 15 SP4 x86_64" selected - And I should see the "Development Tools Module 15 SP4 x86_64" selected - When I select "Containers Module 15 SP4 x86_64" as a product - Then I should see the "Containers Module 15 SP4 x86_64" selected - When I click the Add Product button - And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added - Then the SLE15 SP4 product should be added + Scenario: Add openSUSE Leap 15.4 product, inlcuding Uyuni Client Tools + When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-devel-leap opensuse_leap15_4-uyuni-client" with arch "x86_64" @proxy @susemanager @@ -112,6 +91,7 @@ Feature: Synchronize products in the products page of the Setup Wizard And I wait until I see "SUSE Manager Retail Branch Server 4.3 x86_64" product has been added @scc_credentials +@susemanager Scenario: Installer update channels got enabled when products were added When I execute mgr-sync "list channels" with user "admin" and password "admin" And I should get " [I] SLE15-SP4-Installer-Updates for x86_64 SUSE Linux Enterprise Server 15 SP4 x86_64 [sle15-sp4-installer-updates-x86_64]" diff --git a/testsuite/features/reposync/srv_wait_for_reposync.feature b/testsuite/features/reposync/srv_wait_for_reposync.feature index 053c4b402d1f..7e8e419ed570 100644 --- a/testsuite/features/reposync/srv_wait_for_reposync.feature +++ b/testsuite/features/reposync/srv_wait_for_reposync.feature @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022 SUSE LLC +# Copyright (c) 2019-2023 SUSE LLC # Licensed under the terms of the MIT license. Feature: Wait for reposync activity to finish in CI context @@ -17,8 +17,8 @@ Feature: Wait for reposync activity to finish in CI context When I kill all running spacewalk-repo-sync, excepted the ones needed to bootstrap @uyuni - Scenario: Enable SLES15 SP4 Uyuni client tools for creating bootstrap repositories - When I use spacewalk-common-channel to add channel "sle-product-sles15-sp4-pool-x86_64 sles15-sp4-uyuni-client" with arch "x86_64" + Scenario: Sync openSUSE Leap 15.4 product, inlcuding Uyuni Client Tools + When I call spacewalk-repo-sync to sync the parent channel "opensuse_leap15_4-x86_64" Scenario: Wait until all synchronized channels have finished When I wait until all synchronized channels have finished diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb index f6a5acea4fec..d7225cdde7c9 100644 --- a/testsuite/features/step_definitions/command_steps.rb +++ b/testsuite/features/step_definitions/command_steps.rb @@ -778,6 +778,10 @@ @command_output, _code = $server.run("spacewalk-repo-sync -c #{channel}", check_errors: false) end +When(/^I call spacewalk\-repo\-sync to sync the parent channel "(.*?)"$/) do |channel| + @command_output, _code = $server.run("spacewalk-repo-sync -p #{channel}", check_errors: false) +end + When(/^I get "(.*?)" file details for channel "(.*?)" via spacecmd$/) do |arg1, arg2| @command_output, _code = $server.run("spacecmd -u admin -p admin -q -- configchannel_filedetails #{arg2} '#{arg1}'", check_errors: false) end diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb index 7b135caf9d6a..228fda73e5e0 100644 --- a/testsuite/features/support/commonlib.rb +++ b/testsuite/features/support/commonlib.rb @@ -37,7 +37,7 @@ def compute_channels_to_leave_running os_family = node.os_family next unless ['sles', 'rocky'].include?(os_family) os_version = os_version.split('.')[0] if os_family == 'rocky' - log "Can't build list of reposyncs to leave running" unless %w[15-SP3 15-SP4 8].include? os_version + log "Can't build list of reposyncs to leave running" unless %w[15-SP3 15-SP4 15.4 8].include? os_version do_not_kill += CHANNEL_TO_SYNCH_BY_OS_VERSION[os_version] end do_not_kill.uniq diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb index c244851dbb31..a605ac65f0d0 100644 --- a/testsuite/features/support/constants.rb +++ b/testsuite/features/support/constants.rb @@ -133,13 +133,22 @@ # For containers we do not have SCC, so we set the Fake Base Channel # for sle_minion sle_base_channel = - if ENV['PROVIDER'].include? 'podman' + if $is_container_provider 'Fake Base Channel' + elsif $product == 'Uyuni' + 'openSUSE Leap 15.4 (x86_64)' else 'SLES15-SP4-Pool' end -BASE_CHANNEL_BY_CLIENT = { 'proxy' => 'SLE-Product-SUSE-Manager-Proxy-4.3-Pool', +proxy_base_channel = + if $product == 'Uyuni' + 'openSUSE Leap 15.4 (x86_64)' + else + 'SLE-Product-SUSE-Manager-Proxy-4.3-Pool' + end + +BASE_CHANNEL_BY_CLIENT = { 'proxy' => proxy_base_channel, 'sle_minion' => sle_base_channel, 'ssh_minion' => 'SLES15-SP4-Pool', 'rhlike_minion' => 'RHEL8-Pool for x86_64', From a788e807f80677379e009b76a78760e01e7319a7 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Thu, 3 Aug 2023 17:28:00 +0200 Subject: [PATCH 022/127] Extend waiting time for solv file to 10 minutes (#7355) --- testsuite/features/step_definitions/command_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb index d7225cdde7c9..7b805f2d68fb 100644 --- a/testsuite/features/step_definitions/command_steps.rb +++ b/testsuite/features/step_definitions/command_steps.rb @@ -403,7 +403,7 @@ end Then(/^solver file for "([^"]*)" should reference "([^"]*)"$/) do |channel, pkg| - repeat_until_timeout(timeout: 300, message: "Reference #{pkg} not found in file.") do + repeat_until_timeout(timeout: 600, message: "Reference #{pkg} not found in file.") do _result, code = $server.run("dumpsolv /var/cache/rhn/repodata/#{channel}/solv | grep #{pkg}", check_errors: false) break if code.zero? end From 42aeb6eb295a2b53ac2487d0593a1cfe35b94446 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Thu, 3 Aug 2023 17:37:09 +0200 Subject: [PATCH 023/127] Testsuite: Add step to filter formulas (#7349) * Add step to filter formulas * Correct placeholder name --- .../features/secondary/min_salt_formulas_advanced.feature | 1 + testsuite/features/step_definitions/navigation_steps.rb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/testsuite/features/secondary/min_salt_formulas_advanced.feature b/testsuite/features/secondary/min_salt_formulas_advanced.feature index d8794257f593..b390639c80b2 100644 --- a/testsuite/features/secondary/min_salt_formulas_advanced.feature +++ b/testsuite/features/secondary/min_salt_formulas_advanced.feature @@ -14,6 +14,7 @@ Feature: Use advanced features of Salt formulas When I install "form.yml" to custom formula metadata directory "testform" And I install "metadata.yml" to custom formula metadata directory "testform" When I follow the left menu "Salt > Formula Catalog" + And I enter "testform" as the filtered formula name Then I should see a "testform" text Scenario: Assign test formula to minion via group formula diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index 06c30eb98579..ebf47cfb99af 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -841,6 +841,10 @@ find("input[placeholder='Filter by Snippet Name: ']").set(input) end +When(/^I enter "([^"]*)" as the filtered formula name$/) do |input| + find("input[placeholder='Filter by formula name']").set(input) +end + When(/^I enter the package for "([^"]*)" as the filtered package name$/) do |host| step %(I enter "#{PACKAGE_BY_CLIENT[host]}" as the filtered package name) end From 27f9d918a10c668ce36f937d0046fca0697c3965 Mon Sep 17 00:00:00 2001 From: Karl Tarvas Date: Thu, 3 Aug 2023 22:13:31 +0300 Subject: [PATCH 024/127] Fix message map translations (#7353) * Clean up message map usage * msgMap -> messageMap * Update changes --- web/html/src/components/FormulaForm.tsx | 11 ++++------ web/html/src/components/messages.tsx | 2 +- .../api/use-mandatory-channels-api.ts | 6 ++++-- .../manager/admin/config/monitoring-admin.tsx | 16 +++++++------- .../setup/products/products-scc-dialog.tsx | 6 ++++-- .../manager/admin/setup/products/products.tsx | 6 ++++-- .../group-formula-selection.renderer.tsx | 21 +++++++++++-------- .../groups/formula/group-formula.renderer.tsx | 18 ++++++++-------- web/html/src/manager/images/image-build.tsx | 4 ++-- web/html/src/manager/images/image-import.tsx | 6 ++++-- .../src/manager/images/image-profile-edit.tsx | 6 +++--- .../src/manager/images/image-profiles.tsx | 6 +++--- .../src/manager/images/image-store-edit.tsx | 6 +++--- web/html/src/manager/images/image-stores.tsx | 6 +++--- web/html/src/manager/images/image-view.tsx | 10 +++++---- .../minion-formula-selection.renderer.tsx | 21 +++++++++++-------- .../formula/minion-formula.renderer.tsx | 18 ++++++++-------- .../activation-key-channels-api.tsx | 6 ++++-- .../src/manager/systems/delete-system.tsx | 8 ++++--- .../systems/details/mgr-server-info.tsx | 6 +++--- .../systems/ssm/ssm-subscribe-channels.tsx | 10 ++++++--- .../subscribe-channels/subscribe-channels.tsx | 6 ++++-- web/spacewalk-web.changes.eth.msgmap | 1 + 23 files changed, 116 insertions(+), 90 deletions(-) create mode 100644 web/spacewalk-web.changes.eth.msgmap diff --git a/web/html/src/components/FormulaForm.tsx b/web/html/src/components/FormulaForm.tsx index a320a3041cdb..f1613b69d36d 100644 --- a/web/html/src/components/FormulaForm.tsx +++ b/web/html/src/components/FormulaForm.tsx @@ -20,8 +20,8 @@ import { Loading } from "./utils"; const capitalize = Utils.capitalize; -const defaultMessageTexts = { - pillar_only_formula_saved:

{t("Formula saved. Applying the highstate is not needed for this formula.")}

, +const defaultMessageMap = { + pillar_only_formula_saved: t("Formula saved. Applying the highstate is not needed for this formula."), }; export enum SectionState { @@ -204,11 +204,8 @@ class FormulaForm extends React.Component { } }; - getMessageText = (msg) => { - if (!this.props.messageTexts[msg] && defaultMessageTexts[msg]) { - return defaultMessageTexts[msg]; - } - return this.props.messageTexts[msg] ? this.props.messageTexts[msg] : msg; + getMessageText = (msg: string) => { + return this.props.messageTexts[msg] || defaultMessageMap[msg] || msg; }; render() { diff --git a/web/html/src/components/messages.tsx b/web/html/src/components/messages.tsx index 1322fcbad74f..29ccbcbae0cd 100644 --- a/web/html/src/components/messages.tsx +++ b/web/html/src/components/messages.tsx @@ -82,7 +82,7 @@ export class Messages extends React.Component { var msgs = items.map((item, index) => (
- {Array.isArray(item.text) ? item.text.map((txt, i) =>
{txt}
) : item.text} + {item.text}
)); diff --git a/web/html/src/core/channels/api/use-mandatory-channels-api.ts b/web/html/src/core/channels/api/use-mandatory-channels-api.ts index ea9375ed4cbb..04e96c2a0054 100644 --- a/web/html/src/core/channels/api/use-mandatory-channels-api.ts +++ b/web/html/src/core/channels/api/use-mandatory-channels-api.ts @@ -14,7 +14,7 @@ import { MessageType } from "components/messages"; import { JsonResult } from "utils/network"; import Network from "utils/network"; -const msgMap = { +const messageMap = { base_not_found_or_not_authorized: t("Base channel not found or not authorized."), child_not_found_or_not_authorized: t("Child channel not found or not authorized."), invalid_channel_id: t("Invalid channel id"), @@ -63,7 +63,9 @@ const useMandatoryChannelsApi = (): UseMandatoryChannelsApiReturnType => { setRequiredByChannels(dependencies.requiredByChannels); }) .catch((jqXHR: JQueryXHR, arg: string = "") => { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); setMessages(messages.concat(msg)); }) .finally(() => setIsDependencyDataLoaded(true)); diff --git a/web/html/src/manager/admin/config/monitoring-admin.tsx b/web/html/src/manager/admin/config/monitoring-admin.tsx index 4c904666f697..b6abd1bcf827 100644 --- a/web/html/src/manager/admin/config/monitoring-admin.tsx +++ b/web/html/src/manager/admin/config/monitoring-admin.tsx @@ -22,7 +22,7 @@ const { capitalize } = Utils; const msgRestart = t("Restart is needed for the configuration changes to take effect."); -const msgMap = { +const messageMap = { internal_error: t("An internal error has occurred. See the server logs for details."), enabling_failed: t("Enabling monitoring failed. See the server logs for details."), enabling_failed_partially: t( @@ -78,7 +78,7 @@ const ExporterIcon = (props: { ? "item-enabled-pending" : "item-enabled"; if (props.message) { - tooltip = t("Enabled") + ". " + msgMap[props.name + "_msg_" + props.message]; + tooltip = t("Enabled") + ". " + messageMap[props.name + "_msg_" + props.message]; } else { tooltip = t("Enabled"); } @@ -88,7 +88,7 @@ const ExporterIcon = (props: { ? "item-error-pending" : "item-error"; if (props.message) { - tooltip = t("Disabled") + ". " + msgMap[props.name + "_msg_" + props.message]; + tooltip = t("Disabled") + ". " + messageMap[props.name + "_msg_" + props.message]; } else { tooltip = t("Disabled"); } @@ -192,7 +192,7 @@ const ExportersMessages = (props: { .map((key) => (
  • - {msgMap[key + "_msg_" + props.messages[key]]} + {messageMap[key + "_msg_" + props.messages[key]]}
    • ))} @@ -219,7 +219,9 @@ const MonitoringAdmin = (props: MonitoringAdminProps) => { } = useMonitoringApi(); const handleResponseError = (jqXHR: JQueryXHR, arg: string = "") => { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); setMessages(msg); }; @@ -234,9 +236,9 @@ const MonitoringAdmin = (props: MonitoringAdminProps) => { changeStatus(enable) .then((result: any) => { if (result.success) { - setMessages(MessagesUtils.success(msgMap[result.message])); + setMessages(MessagesUtils.success(messageMap[result.message])); } else { - setMessages(MessagesUtils.error(result.message in msgMap ? msgMap[result.message] : result.message)); + setMessages(MessagesUtils.error(result.message in messageMap ? messageMap[result.message] : result.message)); } }) .catch(handleResponseError); diff --git a/web/html/src/manager/admin/setup/products/products-scc-dialog.tsx b/web/html/src/manager/admin/setup/products/products-scc-dialog.tsx index 0548aa05ca62..05b76684fe0e 100644 --- a/web/html/src/manager/admin/setup/products/products-scc-dialog.tsx +++ b/web/html/src/manager/admin/setup/products/products-scc-dialog.tsx @@ -5,7 +5,7 @@ import { Messages, MessageType } from "components/messages"; import Network from "utils/network"; -const msgMap = { +const messageMap = { // Nothing for now }; @@ -136,7 +136,9 @@ class SCCDialog extends React.Component { currentStep.inProgress = false; currentStep.success = false; } - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); this.setState({ steps: stepList, errors: this.state.errors.concat(msg) }); }; diff --git a/web/html/src/manager/admin/setup/products/products.tsx b/web/html/src/manager/admin/setup/products/products.tsx index d5e566265f63..5011545a1a6d 100644 --- a/web/html/src/manager/admin/setup/products/products.tsx +++ b/web/html/src/manager/admin/setup/products/products.tsx @@ -44,7 +44,7 @@ declare global { } } -const msgMap = { +const messageMap = { // Nothing for now }; @@ -281,7 +281,9 @@ class ProductsPageWrapper extends React.Component { }; handleResponseError = (jqXHR: JQueryXHR, arg = "") => { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); this.setState({ errors: this.state.errors.concat(msg) }); }; diff --git a/web/html/src/manager/groups/formula/group-formula-selection.renderer.tsx b/web/html/src/manager/groups/formula/group-formula-selection.renderer.tsx index 2a324a9f0db9..79c4f3e1e6a2 100644 --- a/web/html/src/manager/groups/formula/group-formula-selection.renderer.tsx +++ b/web/html/src/manager/groups/formula/group-formula-selection.renderer.tsx @@ -10,19 +10,22 @@ import Network from "utils/network"; const capitalize = Utils.capitalize; export const renderer = (renderId, { groupId, warningMessage }) => { - const messageTexts = { - formulas_saved: ( -

    - {t("Formula saved. Edit configuration options in the enabled formulas and apply the ")} - {t("Highstate")} - {t(" for the changes to take effect.")} -

    + const messageMap = { + formulas_saved: t( + "Formula saved. Edit configuration options in the enabled formulas and apply the Highstate for the changes to take effect.", + { + link: (str) => ( + + {str} + + ), + } ), error_invalid_target: t("Invalid target type."), }; - function getMessageText(msg) { - return messageTexts[msg] ? t(messageTexts[msg]) : msg; + function getMessageText(msg: string) { + return messageMap[msg] || msg; } function saveRequest(component, selectedFormulas) { diff --git a/web/html/src/manager/groups/formula/group-formula.renderer.tsx b/web/html/src/manager/groups/formula/group-formula.renderer.tsx index 4051624bb73d..8a7ecf9b508e 100644 --- a/web/html/src/manager/groups/formula/group-formula.renderer.tsx +++ b/web/html/src/manager/groups/formula/group-formula.renderer.tsx @@ -10,14 +10,14 @@ import { DEPRECATED_unsafeEquals } from "utils/legacy"; const capitalize = Utils.capitalize; export const renderer = (renderId, { groupId, formulaId }) => { - const msgMap = { - formula_saved: ( -

    - {t("Formula saved. Apply the ")} - {t("Highstate")} - {t(" for the changes to take effect.")} -

    - ), + const messageMap = { + formula_saved: t("Formula saved. Apply the Highstate for the changes to take effect.", { + link: (str) => ( + + {str} + + ), + }), error_invalid_target: t("Invalid target type."), }; @@ -53,7 +53,7 @@ export const renderer = (renderId, { groupId, formulaId }) => { return "/rhn/manager/groups/details/formula/" + id + "?sgid=" + groupId; }} scope="group" - messageTexts={msgMap} + messageTexts={messageMap} />, document.getElementById(renderId) ); diff --git a/web/html/src/manager/images/image-build.tsx b/web/html/src/manager/images/image-build.tsx index 8a808d72936c..bde6855dc771 100644 --- a/web/html/src/manager/images/image-build.tsx +++ b/web/html/src/manager/images/image-build.tsx @@ -34,7 +34,7 @@ const typeMap = { kiwi: { name: "Kiwi", buildType: "osimage_build_host" }, }; -const msgMap = { +const messageMap = { unknown_error: t("An unknown error has occurred."), build_scheduled: t("The image build has been scheduled."), taskomatic_error: t( @@ -222,7 +222,7 @@ class BuildImage extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), diff --git a/web/html/src/manager/images/image-import.tsx b/web/html/src/manager/images/image-import.tsx index 868a9abbb254..c32c325822fb 100644 --- a/web/html/src/manager/images/image-import.tsx +++ b/web/html/src/manager/images/image-import.tsx @@ -13,7 +13,7 @@ import { TopPanel } from "components/panels/TopPanel"; import { Utils } from "utils/functions"; import Network from "utils/network"; -const msgMap = { +const messageMap = { not_found: t("Image store not found"), build_scheduled: t("The image import has been scheduled."), taskomatic_error: t( @@ -188,7 +188,9 @@ class ImageImport extends React.Component { Utils.urlBounce("/rhn/manager/cm/images"); } else { this.setState({ - messages: MessagesUtils.error(msgMap[data.messages[0]] ? msgMap[data.messages[0]] : data.messages[0]), + messages: MessagesUtils.error( + messageMap[data.messages[0]] ? messageMap[data.messages[0]] : data.messages[0] + ), }); } }) diff --git a/web/html/src/manager/images/image-profile-edit.tsx b/web/html/src/manager/images/image-profile-edit.tsx index 7893c9164fdd..189cfcbe65a3 100644 --- a/web/html/src/manager/images/image-profile-edit.tsx +++ b/web/html/src/manager/images/image-profile-edit.tsx @@ -32,7 +32,7 @@ const typeMap = { kiwi: { name: "Kiwi", storeType: "os_image" }, }; -const msgMap = { +const messageMap = { invalid_type: "Invalid image type.", activation_key_required: "Please give an activation key", "": "There was an error.", @@ -200,7 +200,7 @@ class CreateImageProfile extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), @@ -226,7 +226,7 @@ class CreateImageProfile extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), diff --git a/web/html/src/manager/images/image-profiles.tsx b/web/html/src/manager/images/image-profiles.tsx index 157ba7db7b96..cf27db9399fa 100644 --- a/web/html/src/manager/images/image-profiles.tsx +++ b/web/html/src/manager/images/image-profiles.tsx @@ -27,7 +27,7 @@ const typeMap = { kiwi: t("Kiwi"), }; -const msgMap = { +const messageMap = { not_found: t("Image profile cannot be found."), delete_success: t("Image profile has been deleted."), delete_success_p: t("Image profiles have been deleted."), @@ -99,7 +99,7 @@ class ImageProfiles extends React.Component { items={[ { severity: "success", - text: msgMap[idList.length > 1 ? "delete_success_p" : "delete_success"], + text: messageMap[idList.length > 1 ? "delete_success_p" : "delete_success"], }, ]} /> @@ -112,7 +112,7 @@ class ImageProfiles extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), diff --git a/web/html/src/manager/images/image-store-edit.tsx b/web/html/src/manager/images/image-store-edit.tsx index 3bbce5b84a13..4b852ff5c603 100644 --- a/web/html/src/manager/images/image-store-edit.tsx +++ b/web/html/src/manager/images/image-store-edit.tsx @@ -26,7 +26,7 @@ const typeMap = { os_image: "OS Image", }; -const msgMap = { +const messageMap = { // Nothing for now }; @@ -104,7 +104,7 @@ class CreateImageStore extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), @@ -128,7 +128,7 @@ class CreateImageStore extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), diff --git a/web/html/src/manager/images/image-stores.tsx b/web/html/src/manager/images/image-stores.tsx index 754ce957f4c2..1c3424692c13 100644 --- a/web/html/src/manager/images/image-stores.tsx +++ b/web/html/src/manager/images/image-stores.tsx @@ -22,7 +22,7 @@ declare global { } } -const msgMap = { +const messageMap = { not_found: t("Image store cannot be found."), delete_success: t("Image store has been deleted."), delete_success_p: t("Image stores have been deleted."), @@ -99,7 +99,7 @@ class ImageStores extends React.Component { items={[ { severity: "success", - text: msgMap[idList.length > 1 ? "delete_success_p" : "delete_success"], + text: messageMap[idList.length > 1 ? "delete_success_p" : "delete_success"], }, ]} /> @@ -112,7 +112,7 @@ class ImageStores extends React.Component { messages: ( { - return { severity: "error", text: msgMap[msg] }; + return { severity: "error", text: messageMap[msg] }; })} /> ), diff --git a/web/html/src/manager/images/image-view.tsx b/web/html/src/manager/images/image-view.tsx index d5c081de92c5..683074b38997 100644 --- a/web/html/src/manager/images/image-view.tsx +++ b/web/html/src/manager/images/image-view.tsx @@ -37,7 +37,7 @@ declare global { } } -const msgMap = { +const messageMap = { not_found: "Image cannot be found.", cluster_info_err: "Cannot retrieve data from cluster '{arg}'. Please check the logs and make sure the cluster API is accessible.", @@ -98,8 +98,8 @@ class ImageView extends React.Component { const add = this.state.messages; const getMsgObj = (msg) => { - if (typeof msgMap[msg] === "string") { - return { severity: severity, text: msgMap[msg] }; + if (typeof messageMap[msg] === "string") { + return { severity: severity, text: messageMap[msg] }; } else { return { severity: severity, text: msg }; } @@ -152,7 +152,9 @@ class ImageView extends React.Component { }; handleResponseError(jqXHR, arg = "") { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], { arg }) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], { arg }) : null + ); this.setState({ messages: this.state.messages.concat(msg) }); } diff --git a/web/html/src/manager/minion/formula/minion-formula-selection.renderer.tsx b/web/html/src/manager/minion/formula/minion-formula-selection.renderer.tsx index 8aa1a49d2912..b56a1f0f9b1f 100644 --- a/web/html/src/manager/minion/formula/minion-formula-selection.renderer.tsx +++ b/web/html/src/manager/minion/formula/minion-formula-selection.renderer.tsx @@ -10,19 +10,22 @@ import Network from "utils/network"; const capitalize = Utils.capitalize; export const renderer = (renderId, { serverId, warningMessage }) => { - const messageTexts = { - formulas_saved: ( -

    - {t("Formula saved. Edit configuration options in the enabled formulas and apply the ")} - {t("Highstate")} - {t(" for the changes to take effect.")} -

    + const messageMap = { + formulas_saved: t( + "Formula saved. Edit configuration options in the enabled formulas and apply the Highstate for the changes to take effect.", + { + link: (str) => ( + + {str} + + ), + } ), error_invalid_target: t("Invalid target type."), }; - function getMessageText(msg) { - return messageTexts[msg] ? messageTexts[msg] : msg; + function getMessageText(msg: string) { + return messageMap[msg] || msg; } function saveRequest(component, selectedFormulas) { diff --git a/web/html/src/manager/minion/formula/minion-formula.renderer.tsx b/web/html/src/manager/minion/formula/minion-formula.renderer.tsx index 2b65cfdce531..de79eb98f003 100644 --- a/web/html/src/manager/minion/formula/minion-formula.renderer.tsx +++ b/web/html/src/manager/minion/formula/minion-formula.renderer.tsx @@ -10,14 +10,14 @@ import { DEPRECATED_unsafeEquals } from "utils/legacy"; const capitalize = Utils.capitalize; export const renderer = (renderId, { serverId, formulaId }) => { - const msgMap = { - formula_saved: ( -

    - {t("Formula saved. Apply the ")} - {t("Highstate")} - {t(" for the changes to take effect.")} -

    - ), + const messageMap = { + formula_saved: t("Formula saved. Apply the Highstate for the changes to take effect.", { + link: (str) => ( + + {str} + + ), + }), error_invalid_target: t("Invalid target type."), }; @@ -57,7 +57,7 @@ export const renderer = (renderId, { serverId, formulaId }) => { return "/rhn/manager/systems/details/formula/" + id + "?sid=" + serverId; }} scope="system" - messageTexts={msgMap} + messageTexts={messageMap} />, document.getElementById(renderId) ); diff --git a/web/html/src/manager/systems/activation-key/activation-key-channels-api.tsx b/web/html/src/manager/systems/activation-key/activation-key-channels-api.tsx index b1c6191d7a74..ce9ee3789b83 100644 --- a/web/html/src/manager/systems/activation-key/activation-key-channels-api.tsx +++ b/web/html/src/manager/systems/activation-key/activation-key-channels-api.tsx @@ -3,7 +3,7 @@ import * as React from "react"; import { DEPRECATED_unsafeEquals } from "utils/legacy"; import Network from "utils/network"; -const msgMap = { +const messageMap = { base_not_found_or_not_authorized: t("Base channel not found or not authorized."), child_not_found_or_not_authorized: t("Child channel not found or not authorized."), invalid_channel_id: t("Invalid channel id"), @@ -131,7 +131,9 @@ class ActivationKeyChannelsApi extends React.Component { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); this.setState((prevState) => ({ messages: prevState.messages.concat(msg), })); diff --git a/web/html/src/manager/systems/delete-system.tsx b/web/html/src/manager/systems/delete-system.tsx index 8b1c564e35f0..23d1e75a039b 100644 --- a/web/html/src/manager/systems/delete-system.tsx +++ b/web/html/src/manager/systems/delete-system.tsx @@ -8,7 +8,7 @@ import { Utils as MessagesUtils } from "components/messages"; import Network from "utils/network"; -const msgMap = { +const messageMap = { minion_unreachable: t("Cleanup timed out. Please check if the machine is reachable."), apply_result_missing: t("No result found in state apply response."), }; @@ -41,7 +41,7 @@ class DeleteSystem extends React.Component { this.props.onDeleteSuccess(); } else { this.setState({ - messages: MessagesUtils.error(data.messages.map((m) => msgMap[m])), + messages: MessagesUtils.error(data.messages.map((m) => messageMap[m])), }); this.showErrorDialog(); } @@ -53,7 +53,9 @@ class DeleteSystem extends React.Component { handleResponseError = (jqXHR, arg = "") => { this.setState({ - messages: Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)), + messages: Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ), }); this.showErrorDialog(); }; diff --git a/web/html/src/manager/systems/details/mgr-server-info.tsx b/web/html/src/manager/systems/details/mgr-server-info.tsx index 6596ed4ef3a2..cf581d743d6e 100644 --- a/web/html/src/manager/systems/details/mgr-server-info.tsx +++ b/web/html/src/manager/systems/details/mgr-server-info.tsx @@ -26,7 +26,7 @@ type State = { messages: MessageType[]; }; -const msgMap = { +const messageMap = { invalid_systemid: t("Not a system id"), unknown_system: t("Unknown System"), system_not_mgr_server: t("System is not a peripheral server"), @@ -53,7 +53,7 @@ class MgrServer extends React.Component { }); } else { this.setState({ - messages: MessagesUtils.error(data.messages.map((m) => msgMap[m])), + messages: MessagesUtils.error(data.messages.map((m) => messageMap[m])), }); } }) @@ -64,7 +64,7 @@ class MgrServer extends React.Component { handleResponseError = (jqXHR, arg = "") => { this.setState({ - messages: Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : msg)), + messages: Network.responseErrorMessage(jqXHR, (status, msg) => (messageMap[msg] ? t(messageMap[msg], arg) : msg)), }); }; diff --git a/web/html/src/manager/systems/ssm/ssm-subscribe-channels.tsx b/web/html/src/manager/systems/ssm/ssm-subscribe-channels.tsx index 6a70d0c3a128..0f6d1406eb96 100644 --- a/web/html/src/manager/systems/ssm/ssm-subscribe-channels.tsx +++ b/web/html/src/manager/systems/ssm/ssm-subscribe-channels.tsx @@ -28,7 +28,7 @@ declare global { } } -const msgMap = { +const messageMap = { taskomatic_error: t("Error scheduling job in Taskomatic. Please check the logs."), no_base_channel_guess: t("Could not determine system default channel."), invalid_change: t("Channel change is invalid."), @@ -789,7 +789,9 @@ class ResultPage extends React.Component { ) : ( - {dto.errorMessage ? msgMap[dto.errorMessage] : t("Unknown error. Could not schedule channel change")} + {dto.errorMessage + ? messageMap[dto.errorMessage] + : t("Unknown error. Could not schedule channel change")} ); }} @@ -904,7 +906,9 @@ class SsmChannelPage extends React.Component { } handleResponseError = (jqXHR, arg = "") => { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); // check if partially successful if (jqXHR.responseJSON.data) { diff --git a/web/html/src/manager/systems/subscribe-channels/subscribe-channels.tsx b/web/html/src/manager/systems/subscribe-channels/subscribe-channels.tsx index 6a09fe30402f..792aa580453e 100644 --- a/web/html/src/manager/systems/subscribe-channels/subscribe-channels.tsx +++ b/web/html/src/manager/systems/subscribe-channels/subscribe-channels.tsx @@ -20,7 +20,7 @@ import { JsonResult } from "utils/network"; declare var actionChains: Array; -const msgMap = { +const messageMap = { taskomatic_error: t("Error scheduling job in Taskomatic. Please check the logs."), base_not_found_or_not_authorized: t("Base channel not found or not authorized."), child_not_found_or_not_authorized: t("Child channel not found or not authorized."), @@ -219,7 +219,9 @@ class SystemChannels extends React.Component { - const msg = Network.responseErrorMessage(jqXHR, (status, msg) => (msgMap[msg] ? t(msgMap[msg], arg) : null)); + const msg = Network.responseErrorMessage(jqXHR, (status, msg) => + messageMap[msg] ? t(messageMap[msg], arg) : null + ); this.setState({ messages: this.state.messages.concat(msg) }); }; diff --git a/web/spacewalk-web.changes.eth.msgmap b/web/spacewalk-web.changes.eth.msgmap new file mode 100644 index 000000000000..6409e8475617 --- /dev/null +++ b/web/spacewalk-web.changes.eth.msgmap @@ -0,0 +1 @@ +- Fix link interpolation in message maps From 4377b5e64ada14788ae2c9db28c122fe8e9a4994 Mon Sep 17 00:00:00 2001 From: Ferdinand Galko Date: Thu, 3 Aug 2023 18:25:50 +0000 Subject: [PATCH 025/127] Translated using Weblate (Slovak) Currently translated at 98.5% (1346 of 1366 strings) Translation: uyuni/web master Translate-URL: https://l10n.opensuse.org/projects/uyuni/web/sk/ --- web/po/sk.po | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/web/po/sk.po b/web/po/sk.po index 2c77c7dd4274..f83b4b17aea5 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-07-28 15:10+0200\n" -"PO-Revision-Date: 2023-08-01 22:15+0000\n" +"PO-Revision-Date: 2023-08-03 21:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -1143,9 +1143,8 @@ msgid "The instance you are looking for does not exist or has been deleted" msgstr "Hľadaný inštancia neexistuje alebo bola vymazaná" #: ../html/src/manager/admin/payg/payg.tsx:68 -#, fuzzy msgid "Instance Hostname: {host}" -msgstr "Názov hostiteľa inštancie: {0}" +msgstr "Názov hostiteľa inštancie: {host}" #: ../html/src/manager/admin/payg/payg.tsx:83 msgid "Delete Pay-as-you-go" @@ -1216,13 +1215,12 @@ msgid "Selected channels were scheduled successfully for syncing." msgstr "Synchronizácia vybraných kanálov bola úspešne naplánovaná." #: ../html/src/manager/admin/setup/products/products.tsx:270 -#, fuzzy msgid "" "The following channel installations for '{product}' failed. Please check log " "files." msgstr "" -"Nasledujúce inštalácie kanálov pre '{0}' zlyhali. Skontrolujte, prosím, " -"súbory záznamov." +"Nasledujúce inštalácie kanálov pre '{product}' zlyhali. Skontrolujte, " +"prosím, súbory záznamov." #: ../html/src/manager/admin/setup/products/products.tsx:319 msgid "" @@ -1658,19 +1656,19 @@ msgid "You can also trigger a first run now by clicking the button below." msgstr "Môžete tiež teraz spustiť prvý beh kliknutím na tlačidlo nižšie." #: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:107 -#, fuzzy msgid "" "Matching data is currently being recomputed, it was started {timeFromNow}." -msgstr "Priraďovacie dáta sa momentálne prepočítavajú, bolo to spustené {0}." +msgstr "" +"Priraďovacie dáta sa momentálne prepočítavajú, bolo to spustené " +"{timeFromNow}." #: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:117 -#, fuzzy msgid "" "Latest successful match data was computed {timeFromNow}, you can trigger a " "new run by clicking the button below." msgstr "" -"Najnovšie úspešné dáta priradenia boli vypočítané {0}, nový beh môžete " -"spustiť kliknutím na tlačidlo nižšie." +"Najnovšie úspešné dáta priradenia boli vypočítané {timeFromNow}, nový beh " +"môžete spustiť kliknutím na tlačidlo nižšie." #: ../html/src/manager/audit/subscription-matching/subscription-matching-matcher-run-panel.tsx:126 msgid "" @@ -2255,9 +2253,8 @@ msgid "The project you are looking for does not exist or has been deleted" msgstr "Hľadaný projekt neexistuje alebo bol vymazaný" #: ../html/src/manager/content-management/project/project.tsx:104 -#, fuzzy msgid "Content Lifecycle Project - {name}" -msgstr "Projekt životného cyklu obsahu - {0}" +msgstr "Projekt životného cyklu obsahu - {name}" #: ../html/src/manager/content-management/project/project.tsx:116 msgid "Delete Project" @@ -2450,9 +2447,8 @@ msgid "disable all modules" msgstr "zakázať všetky moduly" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:63 -#, fuzzy msgid "Build ({count})" -msgstr "Zostaviť ({0})" +msgstr "Zostaviť ({count})" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:70 #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:135 @@ -2485,14 +2481,12 @@ msgid "Version Message" msgstr "Správa o verzii" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:112 -#, fuzzy msgid "Version {version} history" -msgstr "História verzie {0}" +msgstr "História verzie {version}" #: ../html/src/manager/content-management/shared/components/panels/build/build.tsx:148 -#, fuzzy msgid "Version {version} successfully built into {environmentName}" -msgstr "Verzia {0} bola úspešne zabudovaná do {1}" +msgstr "Verzia {version} bola úspešne zabudovaná do {environmentName}" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:38 #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:38 @@ -2533,9 +2527,8 @@ msgid "Environment updated successfully" msgstr "Prostredie bolo úspešne aktualizované" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:117 -#, fuzzy msgid "Environment {name} deleted successfully" -msgstr "Prostredie {0} bolo úspešne vymazané" +msgstr "Prostredie {name} bolo úspešne vymazané" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-lifecycle.tsx:139 msgid "" @@ -2590,9 +2583,8 @@ msgid "Create New Filter" msgstr "Vytvoriť nový filter" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:32 -#, fuzzy msgid "Edit Filter {name}" -msgstr "Upraviť filter {0}" +msgstr "Upraviť filter {name}" #: ../html/src/manager/content-management/shared/components/panels/filters-project/filters-project.tsx:91 msgid "Filters" From 562077e8c2892fdb4d49fce38c869134c50ad44c Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Fri, 4 Aug 2023 08:54:06 +0200 Subject: [PATCH 026/127] reportdb setup: use pg_isactive to wait for postgres (#7358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Checking the socket doesnt work in the container world, using the tool coming with postgres is much cleaner and works in both cases. Co-authored-by: Cédric Bosdonnat --- spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb | 3 +-- .../uyuni-setup-reportdb.changes.mbussolotto.pg_wait | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.mbussolotto.pg_wait diff --git a/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb b/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb index 801d7727c6d4..f15e572a3edb 100755 --- a/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb +++ b/spacewalk/uyuni-setup-reportdb/bin/uyuni-setup-reportdb @@ -289,8 +289,7 @@ EOF if $LSOF /proc > /dev/null ; then while [ -f "$PG_PIDFILE" ] ; do # wait for postmaster to be ready - $LSOF -t -p $(head -1 "$PG_PIDFILE" 2>/dev/null) -a "$PG_SOCKET" > /dev/null \ - && break + pg_isready -q -U $(grep -oP '^db_user ?= ?\K.*' $RHN_CONF) && break sleep 1 done fi diff --git a/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.mbussolotto.pg_wait b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.mbussolotto.pg_wait new file mode 100644 index 000000000000..55a4d0cde790 --- /dev/null +++ b/spacewalk/uyuni-setup-reportdb/uyuni-setup-reportdb.changes.mbussolotto.pg_wait @@ -0,0 +1 @@ +- use pg_isactive to wait for postgres From df5084cd86fc035e329387957245a5a899b22430 Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Fri, 4 Aug 2023 08:54:23 +0200 Subject: [PATCH 027/127] Remove server keys to allow reregistering to different master (#7360) Co-authored-by: Ondrej Holecek --- spacewalk/certs-tools/rhn_bootstrap_strings.py | 9 ++++++++- ...acewalk-certs-tools.changes.mbussolotto.reregistering | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 spacewalk/certs-tools/spacewalk-certs-tools.changes.mbussolotto.reregistering diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py index 89dc320575f9..abe2ed4e01af 100644 --- a/spacewalk/certs-tools/rhn_bootstrap_strings.py +++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py @@ -605,7 +605,7 @@ def getRegistrationStackSh(): call_tukit "zypper --non-interactive update {PKG_NAME_VENV_UPDATE} ||:" fi else - if [ -z "$SNAPSHOT_ID"]; then + if [ -z "$SNAPSHOT_ID" ]; then zypper --non-interactive up {PKG_NAME_UPDATE} $RHNLIB_PKG ||: else call_tukit "zypper --non-interactive update {PKG_NAME_UPDATE} $RHNLIB_PKG ||:" @@ -896,12 +896,14 @@ def getRegistrationSaltSh(productName): fi MINION_ID_FILE="${{SNAPSHOT_PREFIX}}/etc/salt/minion_id" +MINION_PKI_CONF="${{SNAPSHOT_PREFIX}}/etc/salt/pki" MINION_CONFIG_DIR="${{SNAPSHOT_PREFIX}}/etc/salt/minion.d" SUSEMANAGER_MASTER_FILE="${{MINION_CONFIG_DIR}}/susemanager.conf" MINION_SERVICE="salt-minion" if [ $VENV_ENABLED -eq 1 ]; then MINION_ID_FILE="${{SNAPSHOT_PREFIX}}/etc/venv-salt-minion/minion_id" + MINION_PKI_CONF="${{SNAPSHOT_PREFIX}}/etc/venv-salt-minion/pki" MINION_CONFIG_DIR="${{SNAPSHOT_PREFIX}}/etc/venv-salt-minion/minion.d" SUSEMANAGER_MASTER_FILE="${{MINION_CONFIG_DIR}}/susemanager.conf" MINION_SERVICE="venv-salt-minion" @@ -951,6 +953,11 @@ def getRegistrationSaltSh(productName): SALT_RUNNING: 1 EOF +# Remove old minion keys so reregistration do different master works +if [ -d "$MINION_PKI_CONF" ]; then + rm -r "$MINION_PKI_CONF" +fi + if [ -n "$SNAPSHOT_ID" ]; then cat <> "${{MINION_CONFIG_DIR}}/transactional_update.conf" # Enable the transactional_update executor diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.changes.mbussolotto.reregistering b/spacewalk/certs-tools/spacewalk-certs-tools.changes.mbussolotto.reregistering new file mode 100644 index 000000000000..524d9c4fa723 --- /dev/null +++ b/spacewalk/certs-tools/spacewalk-certs-tools.changes.mbussolotto.reregistering @@ -0,0 +1 @@ +- Remove server keys to allow reregistering to different master From c168dbf7b1c69664fd2b4563aa58c1adfe5ec902 Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Fri, 4 Aug 2023 08:54:51 +0200 Subject: [PATCH 028/127] parse virtual-host-gatherer null value (#7282) (#7361) --- .../com/suse/manager/gatherer/GathererJsonIO.java | 12 ++++++++++-- .../manager/gatherer/test/GathererJsonIOTest.java | 8 +++++++- .../com/suse/manager/gatherer/test/modulelist.json | 6 ++++++ java/spacewalk-java.changes.mbussolotto.parse_null | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 java/spacewalk-java.changes.mbussolotto.parse_null diff --git a/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java b/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java index bf425bd87963..fc1a25c47ad6 100644 --- a/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java +++ b/java/code/src/com/suse/manager/gatherer/GathererJsonIO.java @@ -26,6 +26,7 @@ import com.google.gson.TypeAdapter; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import java.io.IOException; @@ -100,11 +101,18 @@ public GathererModule read(JsonReader reader) throws IOException { reader.beginObject(); while (reader.hasNext()) { String key = reader.nextName(); + String value = null; + if (reader.peek() == JsonToken.NULL) { + reader.nextNull(); + } + else { + value = reader.nextString(); + } if (key.equals("module")) { - gm.setName(reader.nextString()); + gm.setName(value); } else { - gm.addParameter(key, reader.nextString()); + gm.addParameter(key, value); } } reader.endObject(); diff --git a/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java b/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java index e3f7869795b6..b0dffff72ed1 100644 --- a/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java +++ b/java/code/src/com/suse/manager/gatherer/test/GathererJsonIOTest.java @@ -55,9 +55,10 @@ public void testReadGathererModules() throws Exception { FileUtils.readStringFromFile(TestUtils.findTestData(MODULELIST).getPath()); Map mods = new GathererJsonIO().readGathererModules(json); - assertEquals(2, mods.keySet().size()); + assertEquals(3, mods.keySet().size()); assertTrue(mods.keySet().contains("VMware")); assertTrue(mods.keySet().contains("SUSECloud")); + assertTrue(mods.keySet().contains("Libvirt")); for (GathererModule g : mods.values()) { if (g.getName().equals("VMware")) { @@ -76,6 +77,11 @@ else if (g.getName().equals("SUSECloud")) { assertTrue(g.getParameters().containsKey("protocol")); assertTrue(g.getParameters().containsKey("tenant")); } + else if (g.getName().equals("Libvirt")) { + assertTrue(g.getParameters().containsKey("uri")); + assertTrue(g.getParameters().containsKey("sasl_username")); + assertTrue(g.getParameters().containsKey("sasl_password")); + } else { fail("Unknown Module"); } diff --git a/java/code/src/com/suse/manager/gatherer/test/modulelist.json b/java/code/src/com/suse/manager/gatherer/test/modulelist.json index 12f3d18e73f1..64613aab280c 100644 --- a/java/code/src/com/suse/manager/gatherer/test/modulelist.json +++ b/java/code/src/com/suse/manager/gatherer/test/modulelist.json @@ -14,6 +14,12 @@ "port": 443, "username": "", "password": "" + }, + "Libvirt": { + "module": "Libvirt", + "uri": "", + "sasl_username": null, + "sasl_password": null } } diff --git a/java/spacewalk-java.changes.mbussolotto.parse_null b/java/spacewalk-java.changes.mbussolotto.parse_null new file mode 100644 index 000000000000..6e9a1cd25822 --- /dev/null +++ b/java/spacewalk-java.changes.mbussolotto.parse_null @@ -0,0 +1 @@ +- parse virtual-host-gatherer null value From df7494d5c46523f5112c4851a997f139ae05ea98 Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Fri, 4 Aug 2023 14:19:30 +0200 Subject: [PATCH 029/127] update strings for translations in web --- web/po/cs.po | 672 ++++++++++++++++++++++----------------- web/po/de.po | 640 ++++++++++++++++++++----------------- web/po/es.po | 659 +++++++++++++++++++++----------------- web/po/fr.po | 622 ++++++++++++++++++++---------------- web/po/it.po | 635 +++++++++++++++++++----------------- web/po/ja.po | 667 +++++++++++++++++++++----------------- web/po/ko.po | 666 +++++++++++++++++++++----------------- web/po/pt.po | 623 ++++++++++++++++++++---------------- web/po/pt_BR.po | 642 ++++++++++++++++++++----------------- web/po/si.po | 622 ++++++++++++++++++++---------------- web/po/sk.po | 659 +++++++++++++++++++++----------------- web/po/spacewalk-web.pot | 622 ++++++++++++++++++++---------------- web/po/zh_CN.po | 666 +++++++++++++++++++++----------------- web/po/zh_HK.po | 622 ++++++++++++++++++++---------------- web/po/zh_TW.po | 622 ++++++++++++++++++++---------------- 15 files changed, 5364 insertions(+), 4275 deletions(-) diff --git a/web/po/cs.po b/web/po/cs.po index 712a92c2624f..c7b315df3c17 100644 --- a/web/po/cs.po +++ b/web/po/cs.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2022-09-19 19:13+0000\n" "Last-Translator: Aleš Kastner \n" "Language-Team: Czech \n" @@ -54,7 +54,7 @@ msgstr "Zadejte prosím povinná pole: {0}" msgid "Invalid format of fields: {fields}" msgstr "Neplatný formát polí: {0}" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -62,19 +62,19 @@ msgstr "" "Na této stránce můžete nakonfigurovat vzorce Salt pro automatickou instalaci " "a konfiguraci softwaru." -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "Rozbalit všechny sekce" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "Sbalit všechny sekce" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "Bez názvu" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "Vyhledat podle názvu skupiny vzorců" @@ -160,8 +160,8 @@ msgstr "Opravdu chcete {0} vybrané {1}? (Vybráno {2} {1})" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -178,9 +178,9 @@ msgstr "Zrušit" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -227,7 +227,7 @@ msgid "Save" msgstr "Uložit" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Vzorce" @@ -304,11 +304,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "Potvrdit" @@ -342,19 +342,19 @@ msgstr "První" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "Předchozí" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "Další" @@ -404,7 +404,7 @@ msgstr "Sobota" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "Název plánu" @@ -521,8 +521,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "Nebyly přiřazeny žádné stavy. Vyhledáváním najděte a přiřaďte stavy." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -637,11 +637,13 @@ msgid "Unprovisioned System" msgstr "Neregistrovaný systém" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "Virtuální hostitel" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "Virtuální hostitel" @@ -653,6 +655,7 @@ msgstr "Virtuální systém" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "Proxy" @@ -671,13 +674,13 @@ msgid "System Locked" msgstr "Systém uzamčen" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 #, fuzzy msgid "Filter" msgstr "Filtry" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 #, fuzzy msgid "Select a filter" msgstr "Vybrat plán" @@ -693,7 +696,7 @@ msgid "({selectedCount} selected)" msgstr "Odstranit vybrané" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vyčistit" @@ -702,6 +705,12 @@ msgstr "Vyčistit" msgid "Select All" msgstr "Vybrat vše" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +#, fuzzy +msgid "All" +msgstr "Povolit" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "položek na stránku" @@ -722,8 +731,8 @@ msgstr "Pomoc" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -860,8 +869,8 @@ msgstr "Nastala chyba. Stav monitorování neznámý. Obnovte stránku." #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -923,29 +932,29 @@ msgstr "dokumentace" msgid " to learn how to consume these metrics." msgstr " naučit se, jak tyto metriky využívat." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "Povolit" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "Zakázat" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "Konfigurace SUSE Manageru - monitorování" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "Nastavte monitorování svého serveru SUSE Manager." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -953,38 +962,38 @@ msgstr "Nastavte monitorování svého serveru SUSE Manager." msgid "General" msgstr "Všeobecné" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "Zavlékací (Bootstrap) skript" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "Organizace" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "Restart" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "Cobbler" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "Serverové systémy s jediným virtuálem" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "Monitorování" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "Restart" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1030,7 +1039,7 @@ msgid "Bastion SSH connection data" msgstr "Údaje o připojení Bastion SSH" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "Průvodce nastavením" @@ -1068,8 +1077,8 @@ msgid "never" msgstr "nikdy" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "z" @@ -1177,35 +1186,35 @@ msgstr "Zrušit průběžnou platbu (Pay-as-you-go)" msgid "Are you sure you want to delete project" msgstr "Opravdu chcete odstranit projekt" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "Aktualizujte katalog produktů ze zákaznického centra SUSE" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "Aktualizovat" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "Buďte prosím trpěliví, může to trvat několik minut." -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "Dokončeno" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "Operace nebyla úspěšná: Prázdná odpověď ze serveru" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1244,7 +1253,7 @@ msgid "" msgstr "" "Následující instalace produktů selhaly. Zkontrolujte žurnálové soubory." -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." @@ -1252,28 +1261,28 @@ msgstr "" "Aktualizace údajů o produktu aktuálně běží na pozadí. Zkuste to znovu " "později." -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "Katalog produktů se stále aktualizuje, vyčkejte." -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "Nejprve vyberte nějaký produkt." -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "Přidat produkty" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "Vymazat výběr produktů" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "Proč se v seznamu nezobrazují všechny produkty?" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." @@ -1281,7 +1290,7 @@ msgstr "" "Produkty zobrazené v tomto seznamu jsou přímo propojeny s přihlašovacími " "údaji Vaší organizace (zrcadlená pověření) a Vašimi předplatnými SUSE." -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." @@ -1289,7 +1298,7 @@ msgstr "" "Domníváte-li se, že nějaké produkty chybí, ujistěte se, že jste v předchozím " "kroku průvodce přidali správná pověření organizace." -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." @@ -1297,20 +1306,20 @@ msgstr "" "Tento server je konfigurován jako podřízený synchronizace mezi servery " "(ISS). Produkty lze spravovat pouze na ISS master." -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "Filtrovat podle architektury" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "Filtrovat podle popisu produktu" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "Popis výrobku" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1318,105 +1327,105 @@ msgstr "Popis výrobku" msgid "Architecture" msgstr "Architektura" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "Arch" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "Kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr " synchronizace kanálů selhala" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr " probíhá synchronizace kanálů" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr " kanály synchronizovány" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" "Chcete-li povolit tento produkt, je třeba nejprve vybrat nadřazený produkt" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "Zvolit tento produkt" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "Tento produkt je zrcadlen." -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "doporučeno" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "zahrnout, co je doporučeno" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "Probíhá aktualizace katalogu produktů SCC" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "Plánování resynchronizace produktů kanálů" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "Je naplánována resynchronizace produktu kanálů" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "Naplánovat resynchronizaci produktů kanálů" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "Zobrazit kanály produktu" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "Kanály produktů - " -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "Povinné kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "Volitelné kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "nesynchronizováno" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "probíhá synchronizace" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "synchronizováno" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "synchronizace selhala" @@ -1576,7 +1585,7 @@ msgstr "Odkaz na SUSE Security CVE" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1593,7 +1602,7 @@ msgstr "Název" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2105,7 +2114,7 @@ msgstr "Epocha" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "Verze" @@ -2195,7 +2204,7 @@ msgstr "Vybrat nepoužité" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "Odstranit vybrané" @@ -2443,13 +2452,6 @@ msgstr "Obsahuje balíček poskytující název" msgid "Contains Package" msgstr "Obsahuje balíček" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -#, fuzzy -msgid "All" -msgstr "Povolit" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 #, fuzzy msgid "Fixes Package Name" @@ -2475,7 +2477,7 @@ msgstr "Sestavení ({0})" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "Sestavení" @@ -2575,13 +2577,13 @@ msgid "Waiting for repositories data to be generated" msgstr "Čekání na vygenerování dat z úložišť" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "Sestaveno" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "Selhalo" @@ -2718,7 +2720,7 @@ msgstr "Vyberte kanál, který má být zvolen jako nový základní kanál" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "Podřízené kanály" @@ -2744,7 +2746,7 @@ msgstr "Tento kanál je povinný" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "povinné" @@ -2756,7 +2758,7 @@ msgstr "žádné podřízené kanály" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2829,43 +2831,30 @@ msgstr "" "Použití konfiguračních kanálů bylo naplánováno pro každý minion server v " "této skupině" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 +#, fuzzy msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " +"the Highstate for the changes to take effect." msgstr "" "Vzorec uložen. Upravte možnosti konfigurace v povolených vzorcích a " "aplikujte " -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "Highstate" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr " aby se změny uplatnily." - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "Neplatný typ cíle." -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " -msgstr "Vzorec uložen. Použijte " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." +msgstr "Vzorec uložen. U tohoto vzorce není potřeba použít highstate." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2873,18 +2862,18 @@ msgid "Systems" msgstr "Systémy" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "Balíčky" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "Záplaty" @@ -2909,8 +2898,8 @@ msgstr "" "Při plánování úkolu došlo k chybě. Ujistěte se, že je spuštěn plánovač úloh." #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "Akce byla úspěšně přidána do Řetězce akcí " @@ -2924,7 +2913,7 @@ msgstr "Sestavení obrazu bylo " #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "naplánována" @@ -2942,7 +2931,7 @@ msgid "Image Type" msgstr "Typ obrazu" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "Úložiště obrazu" @@ -2952,7 +2941,7 @@ msgid "Path" msgstr "Cesta" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2967,7 +2956,7 @@ msgid "Image Profile" msgstr "Profil obrazu" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "Sestavení hostitele" @@ -2979,41 +2968,41 @@ msgstr "Úložiště obrazů nebylo nalezeno" msgid "The image import has been scheduled." msgstr "Import obrazu byl naplánován." -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "Této klávese nejsou přiřazeny žádné kanály." -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "Import obrazu" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "Obrazy kontejnerů lze importovat pouze touto funkcí." -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "Název obrazu" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "Název obrazu je povinný." -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "Verze obrazu" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "Verze obrazu je povinná." -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "Import" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3202,7 +3191,7 @@ msgid "" msgstr "Opravdu chcete smazat zvolená úložiště? (Vybráno {0} úložišť)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "Protokol sestavení" @@ -3220,13 +3209,13 @@ msgstr "Protokol sestavení není k dispozici." #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "Žádné údaje" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "Ve frontě" @@ -3263,7 +3252,7 @@ msgstr " selhalo" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "Sestaveno externě" @@ -3276,37 +3265,37 @@ msgid "Picked Up" msgstr "Zachyceno" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "Klastr" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "Instance" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "Čeká se na aktualizaci ..." #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "Zobrazit souhrn klastru" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "Všechny instance jsou v souladu se Správcem SUSE" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "Byly nalezeny zastaralé instance" @@ -3319,32 +3308,33 @@ msgid "Edit store" msgstr "Upravit úložiště" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "Podrobnosti instance pro '{0}'" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "Jsou dostupné zásadní aktualizace" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "Jsou dostupné běžné aktualizace" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "Jsou dostupné aktualizace balíčků" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "Obraz je aktuální" @@ -3382,13 +3372,13 @@ msgid "Custom Image Information" msgstr "Údaje o zákaznickém obrazu" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "Odstranit obraz" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "Opravdu chcete odstranit obraz" @@ -3490,76 +3480,76 @@ msgstr "Kokon" msgid "Namespace" msgstr "Prostor názvů" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "Úspěšně odstraněno." -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "Byla naplánována kontrola obrazu." -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "Je naplánováno vytvoření obrazu." -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "Obrazy" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "Sestavuje se" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "Neznámý" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "Runtime" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "Zobrazit zastaralé" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "Revize" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "(zastaralé)" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "Aktualizace" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "Naposledy upraveno" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "Odstranit vybrané obrazy" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "Opravdu chcete odstranit vybraný obraz?" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "Opravdu chcete odstranit vybrané obrazy? (Vybráno {0} obrazů)" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Přehled" @@ -4093,7 +4083,7 @@ msgstr "Provedení scénáře bylo" msgid "Applying the config channels has been " msgstr "Použití konfiguračních kanálů bylo " -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "Konfigurace" @@ -4563,9 +4553,10 @@ msgstr "Dvoupísmenný kód země" msgid "City" msgstr "Město" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4702,7 +4693,7 @@ msgstr "Naplánovat opakující se Highstate" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 #, fuzzy msgid "Action Type" msgstr "Akce" @@ -4733,23 +4724,23 @@ msgid "Frequency" msgstr "Frekvence" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "Typ cíle" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 #, fuzzy msgid "Target Name" msgstr "Název hostitele cíle" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "Následovník" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "Skupina" @@ -4766,17 +4757,13 @@ msgstr "" "Níže uvedené časy jsou zobrazeny v časovém pásmu serveru {0}. Naplánovaný " "čas bude časem serveru." -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -#, fuzzy -msgid "Select an Action Type" -msgstr "Vybrat plán" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -#, fuzzy -msgid "Select a Target Type" -msgstr "Typ cíle" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "Highstate" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 #, fuzzy msgid "Custom State" msgstr "Zákaznické kanály" @@ -5038,60 +5025,41 @@ msgstr "" "Každý systém registrovaný tímto aktivačním klíčem bude předplacen vybraným " "podřízeným kanálům." -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "Název systému" +msgid " Systems " +msgstr "Systémy" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "Systémy" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "Balíčky" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 #, fuzzy msgid "Config Diffs" msgstr "Konfigurace URL" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "Základní kanál" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "Typ úložiště" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -#, fuzzy -msgid "Registered Days" -msgstr "Registrované systémy" - -#: ../html/src/manager/systems/all-list.tsx:32 -#, fuzzy -msgid "Groups" -msgstr "Skupina" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "Systémy" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "Systémy" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "Podrobnosti chyb" @@ -5133,6 +5101,7 @@ msgid "Loading SSH Private Key.." msgstr "Načítání privátního klíče SSH.." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "Zavést systém" @@ -5234,12 +5203,12 @@ msgstr "Vypršela doba pro výmaz. Zkontrolujte, zda je stroj dosažitelný." msgid "No result found in state apply response." msgstr "Ve stavu odpovědi na použití nenalezen žádný výsledek." -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "Odstranit profil, bez výmazu" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "Během mazání došlo k chybě" @@ -5284,6 +5253,120 @@ msgstr "Vygenerovat nové heslo databáze hlášení" msgid "Confirm Deletion" msgstr "Potvrdit odstranění" +#: ../html/src/manager/systems/list-filter.tsx:4 +#, fuzzy +msgid "Manager Server" +msgstr "Manažer" + +#: ../html/src/manager/systems/list-filter.tsx:5 +#, fuzzy +msgid "Physical" +msgstr "Fyzická funkce" + +#: ../html/src/manager/systems/list-filter.tsx:12 +#, fuzzy +msgid "Ansible Control Node" +msgstr "Řídicí uzel Ansible" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "Sestavení hostitele" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "Uzel správy" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "Sestavení hostitele" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Virtuální hostitel" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "naplánována" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "Změny kanálu naplánovány." + +#: ../html/src/manager/systems/list-filter.tsx:27 +#, fuzzy +msgid "Kickstart in progress" +msgstr " probíhá" + +#: ../html/src/manager/systems/list-filter.tsx:28 +#, fuzzy +msgid "System is up to date" +msgstr "Obraz je aktuální" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "Systém uzamčen" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +#, fuzzy +msgid "Updates available" +msgstr "Jsou dostupné aktualizace balíčků" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "Ano" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "Ne" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "Název systému" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +#, fuzzy +msgid "Registered Days" +msgstr "Registrované systémy" + +#: ../html/src/manager/systems/list-filter.tsx:52 +#, fuzzy +msgid "Groups" +msgstr "Skupina" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "Vyberte seznam pomahačů (ani proxy serverů ani tradičních klientů)." @@ -5388,12 +5471,12 @@ msgid "Desired base Channel" msgstr "Požadovaný základní kanál" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "Kanály SUSE" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "Zákaznické kanály" @@ -5480,28 +5563,28 @@ msgstr "Akce změn kanálu" msgid "Scheduled" msgstr "Plánováno" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "Neznámá chyba. Nelze naplánovat změnu kanálu" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "Některé změny byly úspěšně naplánovány." -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "Změny kanálu naplánovány." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "(žádný, deaktivovat službu)" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "Změna kanálů byla " -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " @@ -5511,7 +5594,7 @@ msgstr "" "Systém bude odhlášen ze všech softwarových kanálů a bude přihlášen k odběru " "nového základního softwarového kanálu." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " @@ -5521,14 +5604,14 @@ msgstr "" "Neaktivní zaškrtávací políčka označují kanály, které nelze ručně přihlásit " "nebo odhlásit." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "Nejsou dostupné žádné podřízené kanály." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "Potvrďte změnu softwarového kanálu" @@ -6374,14 +6457,6 @@ msgstr "Filtrovat podle názvu fondu nebo svazku" msgid "Partition separator" msgstr "Oddělovač oddílů" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "Ano" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "Ne" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "Název hostitele" @@ -6626,6 +6701,20 @@ msgstr "Zdroj nebyl nalezen." msgid "HTTP Error code " msgstr "Kód chyby HTTP " +#~ msgid " for the changes to take effect." +#~ msgstr " aby se změny uplatnily." + +#~ msgid "Formula saved. Apply the " +#~ msgstr "Vzorec uložen. Použijte " + +#, fuzzy +#~ msgid "Select an Action Type" +#~ msgstr "Vybrat plán" + +#, fuzzy +#~ msgid "Select a Target Type" +#~ msgstr "Typ cíle" + #, fuzzy #~ msgid "The action has been {0}." #~ msgstr "Akce byla " @@ -6786,9 +6875,6 @@ msgstr "Kód chyby HTTP " #~ msgid "Edit properties" #~ msgstr "Upravit vlastnosti" -#~ msgid "Management node" -#~ msgstr "Uzel správy" - #~ msgid "System group" #~ msgstr "Systémová skupina" diff --git a/web/po/de.po b/web/po/de.po index 3077e1ff5999..03babd1edfa2 100644 --- a/web/po/de.po +++ b/web/po/de.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2022-01-11 14:51+0000\n" "Last-Translator: Michael Calmer \n" "Language-Team: German \n" @@ -53,25 +53,25 @@ msgstr "Pflichtfelder bitte ausfüllen: {0}" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -153,8 +153,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -171,9 +171,9 @@ msgstr "Abbrechen" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -217,7 +217,7 @@ msgid "Save" msgstr "Speichern" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Formulare" @@ -289,11 +289,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "Bestätigen" @@ -326,19 +326,19 @@ msgstr "Erste" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "Vorherige" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "Nächste" @@ -388,7 +388,7 @@ msgstr "Samstag" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -500,8 +500,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -612,11 +612,13 @@ msgid "Unprovisioned System" msgstr "System" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "System" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -628,6 +630,7 @@ msgstr "System" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -646,12 +649,12 @@ msgid "System Locked" msgstr "System gesperrt" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 #, fuzzy msgid "Select a filter" msgstr "Alles auswählen" @@ -666,7 +669,7 @@ msgid "({selectedCount} selected)" msgstr "({0} ausgewählt)" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Leeren" @@ -675,6 +678,11 @@ msgstr "Leeren" msgid "Select All" msgstr "Alles auswählen" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "Einträge pro Seite" @@ -695,8 +703,8 @@ msgstr "Hilfe" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -820,8 +828,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -882,29 +890,29 @@ msgstr "Dokumentation" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "Aktivieren" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "Deaktivieren" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -912,38 +920,38 @@ msgstr "" msgid "General" msgstr "Allgemein" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "Organisationen" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "Neustart" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "Cobbler" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -989,7 +997,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1027,8 +1035,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "von" @@ -1135,35 +1143,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1196,65 +1204,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1262,104 +1270,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1516,7 +1524,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1533,7 +1541,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2021,7 +2029,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2110,7 +2118,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2356,12 +2364,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2384,7 +2386,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2476,13 +2478,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2616,7 +2618,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2642,7 +2644,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2654,7 +2656,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2717,40 +2719,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2759,18 +2746,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2794,8 +2781,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2809,7 +2796,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2827,7 +2814,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2837,7 +2824,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2852,7 +2839,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2864,41 +2851,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3085,7 +3072,7 @@ msgid "" msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3103,13 +3090,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3146,7 +3133,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3159,37 +3146,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3202,31 +3189,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3264,13 +3252,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3372,76 +3360,76 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "Sind sie sicher, dass sie das Projekt löschen wollen " -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3951,7 +3939,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4410,9 +4398,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4543,7 +4532,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4570,23 +4559,23 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 #, fuzzy msgid "Target Name" msgstr "Nachname" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4600,17 +4589,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -#, fuzzy -msgid "Select an Action Type" -msgstr "Alles auswählen" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -#, fuzzy -msgid "Select a Target Type" -msgstr "Alles auswählen" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4866,56 +4851,39 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" +msgid " Systems " msgstr "System" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "System" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "System" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "System" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "System" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4955,6 +4923,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5044,12 +5013,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5096,6 +5065,107 @@ msgstr "Neues Passwort generieren" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "System" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "System gesperrt" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "System" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5194,12 +5264,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5281,49 +5351,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6154,14 +6224,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" @@ -6402,6 +6464,14 @@ msgstr "" msgid "HTTP Error code " msgstr "" +#, fuzzy +#~ msgid "Select an Action Type" +#~ msgstr "Alles auswählen" + +#, fuzzy +#~ msgid "Select a Target Type" +#~ msgstr "Alles auswählen" + #~ msgid "Page" #~ msgstr "Seite" diff --git a/web/po/es.po b/web/po/es.po index 2a2ed7661b60..9858af56d9ad 100644 --- a/web/po/es.po +++ b/web/po/es.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2020-09-01 09:07+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish \n" @@ -55,26 +55,26 @@ msgstr "Rellene los campos obligatorios: {0}" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 #, fuzzy msgid "Unnamed" msgstr "Nombre de usuario" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -159,8 +159,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -177,9 +177,9 @@ msgstr "Cancelar" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -223,7 +223,7 @@ msgid "Save" msgstr "Guardar" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Fórmulas" @@ -298,11 +298,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "Confirmar" @@ -336,19 +336,19 @@ msgstr "Primero" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "Siguiente" @@ -399,7 +399,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "Nombre de programación" @@ -516,8 +516,8 @@ msgstr "" "asignar estados." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -633,11 +633,13 @@ msgid "Unprovisioned System" msgstr "Sistema no registrado" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "Redes" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 #, fuzzy msgid "Virtual Host" @@ -650,6 +652,7 @@ msgstr "Sistemas virtuales alojados" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -668,13 +671,13 @@ msgid "System Locked" msgstr "Sistema bloqueado" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 #, fuzzy msgid "Filter" msgstr "Filtros" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 #, fuzzy msgid "Select a filter" msgstr "Crear un filtro nuevo" @@ -689,7 +692,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vaciar" @@ -698,6 +701,12 @@ msgstr "Vaciar" msgid "Select All" msgstr "Seleccionar todo" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +#, fuzzy +msgid "All" +msgstr "Permitir" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "elementos por página" @@ -718,8 +727,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -859,8 +868,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -922,29 +931,29 @@ msgstr "documentación" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "Activar" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "Desactivar" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "Configuración de SUSE Manager. Supervisión" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "Configure la supervisión del servidor de SUSE Manager." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -952,39 +961,39 @@ msgstr "Configure la supervisión del servidor de SUSE Manager." msgid "General" msgstr "Generales" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "Organizaciones" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "Reiniciar" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "Sistemas sin sistema operativo" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "Supervisión" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 #, fuzzy msgid "Restarting" msgstr "Reiniciar" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1033,7 +1042,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "Asistente de configuración" @@ -1072,8 +1081,8 @@ msgid "never" msgstr "Gravedad" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "de" @@ -1185,35 +1194,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "¿Confirma que quiere eliminar el proyecto" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1246,65 +1255,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "Todavía se está actualizando el catálogo de productos; aguarde." -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "Seleccione un producto primero." -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "Añadir productos" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "Vaciar selección de productos" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "¿Por qué no figuran todos los productos en la lista?" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "Descripción de producto" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1312,104 +1321,104 @@ msgstr "Descripción de producto" msgid "Architecture" msgstr "Arquitectura" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "Arq." -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "Canales" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr " canales sincronizados" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1568,7 +1577,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1585,7 +1594,7 @@ msgstr "Nombre" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2081,7 +2090,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "Versión" @@ -2172,7 +2181,7 @@ msgstr "Seleccionar" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2426,13 +2435,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -#, fuzzy -msgid "All" -msgstr "Permitir" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2458,7 +2460,7 @@ msgstr "Anfitrión de compilación" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2552,13 +2554,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2694,7 +2696,7 @@ msgstr "Elija el canal que se deberá utilizar como base" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2723,7 +2725,7 @@ msgstr "Este canal está recomendado" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2735,7 +2737,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2801,41 +2803,29 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" +"Se ha guardado la fórmula. No es necesario aplicar el estado alto en esta " +"fórmula." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2843,18 +2833,18 @@ msgid "Systems" msgstr "Sistemas" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "Paquetes" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "Parches" @@ -2880,8 +2870,8 @@ msgstr "" "programador de tareas esté ejecutándose." #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2895,7 +2885,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "programado" @@ -2914,7 +2904,7 @@ msgid "Image Type" msgstr "Tipo de imagen" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2924,7 +2914,7 @@ msgid "Path" msgstr "Ruta" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2940,7 +2930,7 @@ msgid "Image Profile" msgstr "Eliminar perfil" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "Anfitrión de compilación" @@ -2952,41 +2942,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "No hay ningún canal asignado a esta clave." -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "Importar imagen" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "Nombre de imagen" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "Se requiere el nombre de la imagen." -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "Versión de imagen" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "Se requiere la versión de la imagen." -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "Importar" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3177,7 +3167,7 @@ msgstr "" "{0})" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 #, fuzzy msgid "Build Log" msgstr "Anfitrión de compilación" @@ -3196,13 +3186,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3239,7 +3229,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3252,37 +3242,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3295,32 +3285,33 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "Detalles de ejemplar para «{0}»" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3358,13 +3349,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "¿Confirma que quiere eliminar la imagen" @@ -3467,70 +3458,70 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "Actualizaciones" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "Última modificación" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "Eliminar imágenes seleccionadas" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "¿Confirma que quiere eliminar la imagen seleccionada?" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" @@ -3538,7 +3529,7 @@ msgstr "" "¿Confirma que quiere eliminar las imágenes seleccionadas? (se seleccionaron " "{0})" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Visión de conjunto" @@ -4073,7 +4064,7 @@ msgstr "La acción se ha " msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 #, fuzzy msgid "Configuration" @@ -4545,9 +4536,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4692,7 +4684,7 @@ msgstr "Estado de acción" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 #, fuzzy msgid "Action Type" msgstr "Acción" @@ -4721,24 +4713,24 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 #, fuzzy msgid "Target Type" msgstr "Tipo de imagen" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 #, fuzzy msgid "Target Name" msgstr "Tipo de fuente" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4752,17 +4744,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -#, fuzzy -msgid "Select an Action Type" -msgstr "Crear un filtro nuevo" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -#, fuzzy -msgid "Select a Target Type" -msgstr "Tipo de imagen" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 #, fuzzy msgid "Custom State" msgstr "Estado de acción" @@ -5028,58 +5016,40 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "Nombre de sistema" +msgid " Systems " +msgstr "Sistemas" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "Sistemas" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "Paquetes" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "Canal de base" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "Nombre de sistema" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -#, fuzzy -msgid "Registered Days" -msgstr "Sistema no registrado" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "Sistemas" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "Sistemas" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 #, fuzzy msgid "Error Details" @@ -5120,6 +5090,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5211,13 +5182,13 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 #, fuzzy msgid "Delete Profile Without Cleanup" msgstr "Eliminar perfil" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5265,6 +5236,114 @@ msgstr "Generar contraseña nueva" msgid "Confirm Deletion" msgstr "Confirmar eliminación" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "Anfitrión de compilación" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "Nodo de gestión" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "Anfitrión de compilación" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Redes" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "programado" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "programado" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "Sistema bloqueado" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "Sí" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +#, fuzzy +msgid "No" +msgstr "Ninguna" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "Nombre de sistema" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +#, fuzzy +msgid "Registered Days" +msgstr "Sistema no registrado" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5364,12 +5443,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5451,49 +5530,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6362,15 +6441,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "Sí" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -#, fuzzy -msgid "No" -msgstr "Ninguna" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" @@ -6619,6 +6689,14 @@ msgstr "" msgid "HTTP Error code " msgstr "" +#, fuzzy +#~ msgid "Select an Action Type" +#~ msgstr "Crear un filtro nuevo" + +#, fuzzy +#~ msgid "Select a Target Type" +#~ msgstr "Tipo de imagen" + #~ msgid "Page" #~ msgstr "Página" @@ -6733,9 +6811,6 @@ msgstr "" #~ msgid "Edit properties" #~ msgstr "Editar propiedades" -#~ msgid "Management node" -#~ msgstr "Nodo de gestión" - #~ msgid "System group" #~ msgstr "Grupo de sistemas" diff --git a/web/po/fr.po b/web/po/fr.po index e315f330e7ea..6b9cbdb9e43e 100644 --- a/web/po/fr.po +++ b/web/po/fr.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -48,25 +48,25 @@ msgstr "" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -146,8 +146,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -164,9 +164,9 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -210,7 +210,7 @@ msgid "Save" msgstr "" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "" @@ -282,11 +282,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -319,19 +319,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "" @@ -380,7 +380,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -492,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -600,10 +600,12 @@ msgid "Unprovisioned System" msgstr "" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -614,6 +616,7 @@ msgstr "" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -632,12 +635,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -650,7 +653,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -659,6 +662,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -679,8 +687,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -804,8 +812,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -866,29 +874,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -896,38 +904,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -973,7 +981,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1011,8 +1019,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1117,35 +1125,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1178,65 +1186,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1244,104 +1252,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1498,7 +1506,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1515,7 +1523,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2002,7 +2010,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2091,7 +2099,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2337,12 +2345,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2365,7 +2367,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2456,13 +2458,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2596,7 +2598,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2622,7 +2624,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2634,7 +2636,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2697,40 +2699,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2739,18 +2726,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2774,8 +2761,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2789,7 +2776,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2807,7 +2794,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2817,7 +2804,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2832,7 +2819,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2844,41 +2831,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3063,7 +3050,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3081,13 +3068,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3124,7 +3111,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3137,37 +3124,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3180,31 +3167,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3242,13 +3230,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3350,75 +3338,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3928,7 +3916,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4382,9 +4370,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4513,7 +4502,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4540,22 +4529,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4569,15 +4558,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4833,52 +4820,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4918,6 +4889,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5007,12 +4979,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5057,6 +5029,104 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +msgid "Virtualization Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5153,12 +5223,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5240,49 +5310,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6111,14 +6181,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/it.po b/web/po/it.po index 1cee627d4e16..22a2ef270348 100644 --- a/web/po/it.po +++ b/web/po/it.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2023-05-26 18:14+0000\n" "Last-Translator: Marina Latini \n" "Language-Team: Italian \n" @@ -56,7 +56,7 @@ msgstr "Inserisci i campi obbligatori: {0}" msgid "Invalid format of fields: {fields}" msgstr "Formato dei campi non valido: {0}" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -64,19 +64,19 @@ msgstr "" "In questa pagina è possibile configurare le Formule Salt per l'installazione " "e la configurazione automatica del software." -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "Espandi tutte le sezioni" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "Chiudi tutte le sezioni" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "Senza nome" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "Ricerca per nome del gruppo della formula" @@ -160,8 +160,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -178,9 +178,9 @@ msgstr "Annulla" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -227,7 +227,7 @@ msgid "Save" msgstr "Salva" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Formule" @@ -301,11 +301,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -338,19 +338,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "Avanti" @@ -399,7 +399,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -512,8 +512,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -624,11 +624,13 @@ msgid "Unprovisioned System" msgstr "Sistema" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "Gestore dell'host virtuale" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 #, fuzzy msgid "Virtual Host" @@ -641,6 +643,7 @@ msgstr "Gestore dell'host virtuale" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "Proxy" @@ -659,12 +662,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -677,7 +680,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -686,6 +689,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -706,8 +714,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -831,8 +839,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -893,29 +901,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -923,38 +931,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1000,7 +1008,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1038,8 +1046,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1144,35 +1152,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1205,65 +1213,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1271,104 +1279,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1526,7 +1534,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1543,7 +1551,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2030,7 +2038,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2119,7 +2127,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2366,12 +2374,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2394,7 +2396,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "Crea" @@ -2486,13 +2488,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2626,7 +2628,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2652,7 +2654,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2664,7 +2666,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2727,41 +2729,29 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" +"Formula salvata. L'applicazione dello stato alto non è necessaria per questa " +"formula." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2769,18 +2759,18 @@ msgid "Systems" msgstr "Sistemi" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "Pacchetti" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "Patch" @@ -2804,8 +2794,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2819,7 +2809,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2837,7 +2827,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2847,7 +2837,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2862,7 +2852,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2874,41 +2864,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3093,7 +3083,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 #, fuzzy msgid "Build Log" msgstr "Crea" @@ -3112,13 +3102,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3155,7 +3145,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3168,37 +3158,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3211,31 +3201,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3273,13 +3264,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3381,75 +3372,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "Immagini" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "Creazione" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3959,7 +3950,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4423,9 +4414,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4555,7 +4547,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4582,22 +4574,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "Gruppo" @@ -4611,15 +4603,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4876,58 +4866,40 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "Sistema" +msgid " Systems " +msgstr "Sistemi" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "Sistemi" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "Pacchetti" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "Sistema" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -#, fuzzy -msgid "Groups" -msgstr "Gruppo" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "Sistemi" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "Sistemi" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4967,6 +4939,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5056,12 +5029,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5107,6 +5080,108 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Gestore dell'host virtuale" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "Sistema" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "Sistema" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +#, fuzzy +msgid "Groups" +msgstr "Gruppo" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5204,12 +5279,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5291,49 +5366,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6167,14 +6242,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/ja.po b/web/po/ja.po index 760d43e87b73..2c9edc2cb0cc 100644 --- a/web/po/ja.po +++ b/web/po/ja.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2023-06-27 04:15+0000\n" "Last-Translator: Carina Hagl \n" "Language-Team: Japanese \n" @@ -55,7 +55,7 @@ msgstr "必須の項目に入力を行なってください: {0}" msgid "Invalid format of fields: {fields}" msgstr "項目の書式が正しくありません: {0}" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -63,19 +63,19 @@ msgstr "" "このページでは Salt Formula を設定して、ソフトウェアの自動インストールと設定" "を行なうことができます。" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "すべてのセクションを展開" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "すべてのセクションを折りたたむ" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "名前なし" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "数式のグループ名で検索" @@ -162,8 +162,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -180,9 +180,9 @@ msgstr "取り消し" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -229,7 +229,7 @@ msgid "Save" msgstr "保存" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Formula" @@ -304,11 +304,11 @@ msgstr "動作を実行できません。" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "確認" @@ -341,19 +341,19 @@ msgstr "最初" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "前へ" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "次へ" @@ -403,7 +403,7 @@ msgstr "土曜" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "スケジュール名" @@ -518,8 +518,8 @@ msgstr "" "てください。" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -632,11 +632,13 @@ msgid "Unprovisioned System" msgstr "未登録のシステム" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "仮想ホスト" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "仮想ホスト" @@ -648,6 +650,7 @@ msgstr "仮想システム" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "プロキシ" @@ -666,12 +669,12 @@ msgid "System Locked" msgstr "システムはロック済み" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "フィルタ" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "フィルタの選択" @@ -686,7 +689,7 @@ msgid "({selectedCount} selected)" msgstr "削除を選択しました" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "消去" @@ -695,6 +698,11 @@ msgstr "消去" msgid "Select All" msgstr "すべてを選択" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "すべて" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "1 ページ当たりの項目数" @@ -715,8 +723,8 @@ msgstr "ヘルプ" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -855,8 +863,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -917,29 +925,29 @@ msgstr "ドキュメンテーション" msgid " to learn how to consume these metrics." msgstr " をお読みください。メトリックの消費方法が書かれています。" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "有効" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "無効" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "SUSE Manager 設定 - モニタリング" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "お使いの SUSE Manager サーバ監視を設定します。" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -947,38 +955,38 @@ msgstr "お使いの SUSE Manager サーバ監視を設定します。" msgid "General" msgstr "全般" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "ブートストラップスクリプト" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "組織" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "再起動" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "Cobbler" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "ベアメタルシステム" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "モニタリング" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "再起動" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1024,7 +1032,7 @@ msgid "Bastion SSH connection data" msgstr "要塞SSH接続データ" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "セットアップウィザード" @@ -1062,8 +1070,8 @@ msgid "never" msgstr "なし" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "／" @@ -1172,35 +1180,35 @@ msgstr "従量課金制を削除" msgid "Are you sure you want to delete project" msgstr "プロジェクトを削除してよろしいですか" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "SUSE カスタマーセンターから製品カタログを更新" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "更新" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "この処理にはしばらくの時間がかかります。お待ちください。" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "完了しました" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "操作は成功しませんでした: サーバからの応答が空です" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1239,7 +1247,7 @@ msgstr "" "「{0}」の次のチャンネルのインストールに失敗しました。ログファイルを確認してく" "ださい。" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." @@ -1247,28 +1255,28 @@ msgstr "" "製品データの更新処理が裏で動作しています。しばらくしてからやり直してくださ" "い。" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "まだ製品カタログを更新しています。しばらくお待ちください。" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "まずは製品を選択してください。" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "製品の追加" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "製品の選択解除" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "なぜ一覧に全ての製品が表示されていないのですか？" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." @@ -1276,7 +1284,7 @@ msgstr "" "この一覧内の製品は、お使いの SUSE サブスクリプションと同様に、組織の認可情報 " "(ミラークレデンシャル) に直接結びついています。" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." @@ -1284,7 +1292,7 @@ msgstr "" "存在すべき製品が存在していない場合は、前のウィザード手順で適切な組織の認可情" "報を追加していることをご確認ください。" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." @@ -1292,20 +1300,20 @@ msgstr "" "このサーバはサーバ間同期 (ISS) スレーブとして設定されています。製品は ISS マ" "スター上でのみ管理することができます。" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "アーキテクチャでフィルタ" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "製品説明でフィルタ" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "製品説明" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1313,104 +1321,104 @@ msgstr "製品説明" msgid "Architecture" msgstr "アーキテクチャ" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "Arch" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "チャンネル" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr " チャンネル同期に失敗しました" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr " チャンネル同期を実行しています" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr " チャンネルを同期しました" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "この製品を有効化するには、先に親製品を選択しておく必要があります" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "この製品を選択" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "この製品はミラーされています。" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "推奨" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "推奨を含める" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "SCC 製品カタログの更新を実行しています" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "チャンネル製品の再同期をスケジュールしています" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "チャンネル製品の再同期をスケジュールしました" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "チャンネル製品の再同期をスケジュール" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "製品チャンネルの表示" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "製品チャンネル - " -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "追加したいオプションのチャンネルを選択して確認します。" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "必須チャンネル" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "任意チャンネル" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "同期されていません" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "同期を行なっています" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "同期済み" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "同期が失敗しました" @@ -1572,7 +1580,7 @@ msgstr "SUSEセキュリティCVEリンク" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1589,7 +1597,7 @@ msgstr "名前" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2102,7 +2110,7 @@ msgstr "エポック" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "バージョン" @@ -2193,7 +2201,7 @@ msgstr "使用されていないものを選択" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "削除を選択しました" @@ -2444,12 +2452,6 @@ msgstr "名前を指定したパッケージを含むもの" msgid "Contains Package" msgstr "パッケージを含むもの" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "すべて" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "修正パッケージ名" @@ -2473,7 +2475,7 @@ msgstr "ビルド ({0})" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "ビルド" @@ -2573,13 +2575,13 @@ msgid "Waiting for repositories data to be generated" msgstr "リポジトリデータが生成されるのを待機しています" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "構築済み" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "失敗" @@ -2716,7 +2718,7 @@ msgstr "新しいベースチャンネルとして選択すべきチャンネル #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "子チャンネル" @@ -2742,7 +2744,7 @@ msgstr "このチャンネルは必須チャンネルです" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "必須" @@ -2754,7 +2756,7 @@ msgstr "子チャンネル無し" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2828,43 +2830,31 @@ msgstr "" "このグループ内の各 minion に対して、設定チャンネルの適用をスケジュールしまし" "た" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 +#, fuzzy msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " +"the Highstate for the changes to take effect." msgstr "" "formula を保存しました。有効化された formula 内で設定オプションを編集し、下記" "を適用してください " -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "Highstate" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr " 変更した設定を反映させるには、再起動が必要です。" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "ターゲットタイプが正しくありません。" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " -msgstr "formula を保存しました。下記を適用します " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." +msgstr "" +"formula を保存しました。この formula に対する highstate の適用は不要です。" #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2872,18 +2862,18 @@ msgid "Systems" msgstr "システム" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "パッケージ" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "パッチ" @@ -2909,8 +2899,8 @@ msgstr "" "ていることをご確認ください。" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "動作を動作チェーンに追加しました " @@ -2924,7 +2914,7 @@ msgstr "イメージの構築を " #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "スケジュールしました" @@ -2942,7 +2932,7 @@ msgid "Image Type" msgstr "イメージタイプ" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "イメージストア" @@ -2952,7 +2942,7 @@ msgid "Path" msgstr "パス" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2967,7 +2957,7 @@ msgid "Image Profile" msgstr "イメージプロファイル" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "構築ホスト" @@ -2979,43 +2969,43 @@ msgstr "イメージストアが見つかりませんでした" msgid "The image import has been scheduled." msgstr "イメージの取り込みをスケジュールしました。" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "このキーに割り当てられているチャンネルはありません。" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "イメージの取り込み" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" "この機能を利用することによってのみ、コンテナイメージを取り込むことができま" "す。" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "イメージ名" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "イメージ名を指定する必要があります。" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "イメージバージョン" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "イメージバージョンを指定する必要があります。" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "取り込み" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3209,7 +3199,7 @@ msgstr "" "選択したストアを削除してよろしいですか？ ({0} 個のストアが選択されています)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "構築ログ" @@ -3227,13 +3217,13 @@ msgstr "構築ログは利用できません。" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "情報無し" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "キュー済み" @@ -3270,7 +3260,7 @@ msgstr " は失敗しました" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "外部で構築済み" @@ -3283,37 +3273,37 @@ msgid "Picked Up" msgstr "ピックアップ済み" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "クラスタ" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "インスタンス" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "更新を待っています..." #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "クラスタ概要の表示" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "全てのインスタンスが SUSE Manager と同期できています" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "古いインスタンスが見つかりました" @@ -3326,32 +3316,33 @@ msgid "Edit store" msgstr "ストアの編集" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "'{0}' に対するインスタンスの詳細" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "重大な更新があります" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "重大ではない更新があります" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "パッケージの更新があります" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "イメージは最新の状態です" @@ -3389,13 +3380,13 @@ msgid "Custom Image Information" msgstr "カスタムイメージの情報" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "イメージの削除" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "イメージを削除してよろしいですか" @@ -3497,70 +3488,70 @@ msgstr "ポッド" msgid "Namespace" msgstr "ネームスペース" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "削除を行ないました。" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "イメージの検査をスケジュールしました。" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "イメージの構築をスケジュールしました。" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "イメージ" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "構築しています" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "不明" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "実行時間" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "非推奨の表示" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "リビジョン" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "(非推奨)" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "更新" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "最終変更" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "選択したイメージの削除" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "選択したイメージを削除してよろしいですか？" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" @@ -3568,7 +3559,7 @@ msgstr "" "選択したイメージを削除してよろしいですか？ ({0} 個のイメージが選択されていま" "す)" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "概要" @@ -4111,7 +4102,7 @@ msgstr "動作を" msgid "Applying the config channels has been " msgstr "設定チャンネルの適用を " -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "設定" @@ -4577,9 +4568,10 @@ msgstr "2文字の国コード" msgid "City" msgstr "市区町村" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4709,7 +4701,7 @@ msgstr "定期的なアクションをスケジュールする" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "動作タイプ" @@ -4738,22 +4730,22 @@ msgid "Frequency" msgstr "頻度" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "ターゲットタイプ" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "ターゲット名" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "minion" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "グループ" @@ -4772,15 +4764,13 @@ msgstr "" "サーバのタイムゾーン {0} には、以下の時間が表示されます。スケジュールされた時" "間はサーバ時間になります。" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "動作タイプの選択" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" -msgstr "ターゲットタイプの選択" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "Highstate" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "カスタム状態" @@ -5041,60 +5031,41 @@ msgstr "" "このアクティベーションキーを利用して登録したシステムは、選択した子チャンネル" "をサブスクライブします。" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "システム名" +msgid " Systems " +msgstr "システム" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "システム" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "パッケージ" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 #, fuzzy msgid "Config Diffs" msgstr "設定 URL" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "ベースチャンネル" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "ストアの種類" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -#, fuzzy -msgid "Registered Days" -msgstr "登録済みシステム" - -#: ../html/src/manager/systems/all-list.tsx:32 -#, fuzzy -msgid "Groups" -msgstr "グループ" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "システム" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "システム" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "エラーの詳細" @@ -5137,6 +5108,7 @@ msgid "Loading SSH Private Key.." msgstr "SSH 機密鍵を読み込んでいます.." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "ブートストラップ" @@ -5240,12 +5212,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "状態の適用に対する応答結果が見つかりませんでした。" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "クリーンアップ無しでのプロファイル削除" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "クリーンアップ処理中にエラーが発生しました" @@ -5292,6 +5264,120 @@ msgstr "レポーティングデータベースパスワードの生成" msgid "Confirm Deletion" msgstr "削除の確認" +#: ../html/src/manager/systems/list-filter.tsx:4 +#, fuzzy +msgid "Manager Server" +msgstr "Manager" + +#: ../html/src/manager/systems/list-filter.tsx:5 +#, fuzzy +msgid "Physical" +msgstr "物理機能" + +#: ../html/src/manager/systems/list-filter.tsx:12 +#, fuzzy +msgid "Ansible Control Node" +msgstr "Ansible 制御ノード" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "構築ホスト" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "管理ノード" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "構築ホスト" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "仮想ホスト" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "スケジュールしました" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "チャンネル変更をスケジュールしました。" + +#: ../html/src/manager/systems/list-filter.tsx:27 +#, fuzzy +msgid "Kickstart in progress" +msgstr " は処理中です" + +#: ../html/src/manager/systems/list-filter.tsx:28 +#, fuzzy +msgid "System is up to date" +msgstr "イメージは最新の状態です" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "システムはロック済み" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +#, fuzzy +msgid "Updates available" +msgstr "パッケージの更新があります" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "はい" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "いいえ" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "システム名" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +#, fuzzy +msgid "Registered Days" +msgstr "登録済みシステム" + +#: ../html/src/manager/systems/list-filter.tsx:52 +#, fuzzy +msgid "Groups" +msgstr "グループ" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5401,12 +5487,12 @@ msgid "Desired base Channel" msgstr "必要なベースチャンネル" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "SUSE チャンネル" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "カスタムチャンネル" @@ -5494,29 +5580,29 @@ msgstr "チャンネル変更の動作" msgid "Scheduled" msgstr "スケジュール済み" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" "不明なエラーが発生しました。チャンネル変更をスケジュールできませんでした" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "いくつかの変更をスケジュールしました。" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "チャンネル変更をスケジュールしました。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "(なし、サービスを無効にする)" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "チャンネル変更を " -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " @@ -5526,7 +5612,7 @@ msgstr "" "できます。すべてのソフトウェアチャンネルからサブスクライブを中止して、新しい" "ベースソフトウエアチャンネルにサブスクライブさせます。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " @@ -5536,14 +5622,14 @@ msgstr "" "クボックスが無効化されている場合は、そのチャンネルが手動ではサブスクライブも" "しくはサブスクライブ中止できないものであることを示しています。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "利用可能な子チャンネルがありません。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "ソフトウェアチャンネルの変更確認" @@ -6390,14 +6476,6 @@ msgstr "プールまたはボリューム名でフィルタ" msgid "Partition separator" msgstr "パーティションの区切り" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "はい" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "いいえ" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "ホスト名" @@ -6641,6 +6719,18 @@ msgstr "リソースが見つかりませんでした。" msgid "HTTP Error code " msgstr "HTTP エラーコード " +#~ msgid " for the changes to take effect." +#~ msgstr " 変更した設定を反映させるには、再起動が必要です。" + +#~ msgid "Formula saved. Apply the " +#~ msgstr "formula を保存しました。下記を適用します " + +#~ msgid "Select an Action Type" +#~ msgstr "動作タイプの選択" + +#~ msgid "Select a Target Type" +#~ msgstr "ターゲットタイプの選択" + #~ msgid "The action has been {0}." #~ msgstr "動作は {0} でした。" @@ -6814,9 +6904,6 @@ msgstr "HTTP エラーコード " #~ msgid "Edit properties" #~ msgstr "プロパティの編集" -#~ msgid "Management node" -#~ msgstr "管理ノード" - #~ msgid "System group" #~ msgstr "システムグループ" diff --git a/web/po/ko.po b/web/po/ko.po index 8392899f4f51..f5621f18c06a 100644 --- a/web/po/ko.po +++ b/web/po/ko.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2023-06-27 07:37+0000\n" "Last-Translator: Seeun Lee \n" "Language-Team: Korean \n" @@ -54,7 +54,7 @@ msgstr "필수 필드 입력: {0}" msgid "Invalid format of fields: {fields}" msgstr "잘못된 필드 유형: {0}" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -62,19 +62,19 @@ msgstr "" "이 페이지에서 소프트웨어를 자동으로 설치 및 구성할 Salt 수식을 구성할 수 있습" "니다." -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "전체 섹션 확장" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "전체 섹션 축소" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "이름 없음" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "수식 그룹 이름을 기준으로 검색" @@ -159,8 +159,8 @@ msgstr "선택한 {1}을(를) {0}하시겠습니까?({2} {1} 선택됨)" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -177,9 +177,9 @@ msgstr "취소" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -226,7 +226,7 @@ msgid "Save" msgstr "저장" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "수식" @@ -300,11 +300,11 @@ msgstr "작업을 수행할 수 없습니다." #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "확인" @@ -337,19 +337,19 @@ msgstr "첫 번째" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "이전" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "다음" @@ -399,7 +399,7 @@ msgstr "토요일" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "일정 이름" @@ -512,8 +512,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "상태가 지정되지 않았습니다. 검색을 사용하여 상태를 찾아 지정하십시오." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -626,11 +626,13 @@ msgid "Unprovisioned System" msgstr "미등록 시스템" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 #, fuzzy msgid "Virtual Guest" msgstr "가상 호스트" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "가상 호스트" @@ -642,6 +644,7 @@ msgstr "가상 시스템" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "프록시" @@ -660,12 +663,12 @@ msgid "System Locked" msgstr "시스템 잠김" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "필터" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "필터 선택" @@ -680,7 +683,7 @@ msgid "({selectedCount} selected)" msgstr "선택 항목 삭제" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "지우기" @@ -689,6 +692,11 @@ msgstr "지우기" msgid "Select All" msgstr "모두 선택" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "모두" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "페이지당 항목 수" @@ -709,8 +717,8 @@ msgstr "도움말" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -850,8 +858,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -912,29 +920,29 @@ msgstr "문서" msgid " to learn how to consume these metrics." msgstr " 이러한 메트릭을 사용하는 방법을 알아보십시오." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "활성화" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "비활성화" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "SUSE Manager 구성 - 모니터링" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "SUSE Manager 서버 모니터링을 설정하십시오." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -942,38 +950,38 @@ msgstr "SUSE Manager 서버 모니터링을 설정하십시오." msgid "General" msgstr "일반" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "부트스트랩 스크립트" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "조직" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "다시 시작" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "Cobbler" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "베어 메탈 시스템" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "모니터링" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "다시 시작" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1019,7 +1027,7 @@ msgid "Bastion SSH connection data" msgstr "베스천 SSH 연결 데이터" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "설치 마법사" @@ -1057,8 +1065,8 @@ msgid "never" msgstr "안 함" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "/" @@ -1166,35 +1174,35 @@ msgstr "용량제 삭제" msgid "Are you sure you want to delete project" msgstr "프로젝트를 삭제하시겠습니까" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "SUSE Customer Center에서 제품 카탈로그 새로 고침" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "새로 고침" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "잠시만 기다려 주십시오. 이 작업에는 몇 분이 걸릴 수 있습니다." -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "완료됨" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "작업 실패: 서버에서 빈 회신" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1230,7 +1238,7 @@ msgid "" "files." msgstr "'{0}'에 대한 다음 채널 설치에 실패했습니다. 로그 파일을 확인하십시오." -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." @@ -1238,28 +1246,28 @@ msgstr "" "제품 데이터 새로 고침이 현재 백그라운드에서 실행 중입니다. 나중에 다시 시도하" "십시오." -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "제품 카탈로그를 아직 새로 고치는 중입니다. 기다려 주십시오." -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "우선 일부 제품을 선택하십시오." -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "제품 추가" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "제품 선택 지우기" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "목록에 모든 제품이 표시되지 않는 이유가 무엇입니까?" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." @@ -1267,7 +1275,7 @@ msgstr "" "이 목록에 표시되는 제품은 조직 인증서(미러 인증서)와 SUSE 구독에 직접 연결됩" "니다." -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." @@ -1275,7 +1283,7 @@ msgstr "" "제품이 누락된 경우 이전 마법사 단계에서 올바른 조직 인증서를 추가했는지 확인" "하십시오." -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." @@ -1283,20 +1291,20 @@ msgstr "" "이 서버는 ISS(Inter-Server Synchronisation) 슬레이브로 구성되었습니다. ISS 마" "스터에서만 제품을 관리할 수 있습니다." -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "아키텍처를 기준으로 필터링" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "제품 설명을 기준으로 필터링" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "제품 설명" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1304,104 +1312,104 @@ msgstr "제품 설명" msgid "Architecture" msgstr "아키텍처" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "아키텍처" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "채널" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr " 채널을 동기화하지 못함" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr " 채널 동기화 진행 중" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr " 채널 동기화됨" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "이 제품을 활성화하려면 상위 제품을 우선 선택해야 합니다." -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "이 제품 선택" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "이 제품은 미러링되었습니다." -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "권장" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "권장에 포함" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "SCC 제품 카탈로그 새로 고침 진행 중" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "채널 제품 재동기화 예약" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "채널 제품 재동기화 예약됨" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "채널 제품 재동기화 예약" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "제품 채널 표시" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "제품 채널 - " -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "추가하고 확인하려는 선택 채널을 선택합니다." -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "필수 채널" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "선택 사항 채널" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "동기화되지 않음" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "동기화 진행 중" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "동기화됨" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "동기화 실패" @@ -1559,7 +1567,7 @@ msgstr "SUSE 보안 CVE 링크" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1576,7 +1584,7 @@ msgstr "이름" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2081,7 +2089,7 @@ msgstr "에포크" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "버전" @@ -2170,7 +2178,7 @@ msgstr "미사용 항목 선택" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "선택 항목 삭제" @@ -2417,12 +2425,6 @@ msgstr "이름 제공 패키지 포함" msgid "Contains Package" msgstr "패키지 포함" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "모두" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "패키지 이름 수정" @@ -2446,7 +2448,7 @@ msgstr "빌드({0})" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "빌드" @@ -2544,13 +2546,13 @@ msgid "Waiting for repositories data to be generated" msgstr "리포지토리 데이터 생성을 기다리는 중" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "빌드됨" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "실패" @@ -2687,7 +2689,7 @@ msgstr "새 기본 채널로 선택할 채널 선택" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "하위 채널" @@ -2713,7 +2715,7 @@ msgstr "이 채널은 필수입니다." #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "필수" @@ -2725,7 +2727,7 @@ msgstr "하위 채널 없음" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2797,42 +2799,29 @@ msgid "" "this group" msgstr "이 그룹의 각 minion 서버에 구성 채널 적용이 예약되었습니다." -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 +#, fuzzy msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " +"the Highstate for the changes to take effect." msgstr "" "수식이 저장되었습니다. 활성화된 수식에서 구성 옵션을 편집하고 적용합니다. " -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "Highstate" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr " 구성 옵션을 편집하십시오." - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "잘못된 대상 유형입니다." -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " -msgstr "수식이 저장되었습니다. 다음을 적용: " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." +msgstr "수식이 저장되었습니다. 이 수식에는 highstate를 적용할 필요가 없습니다." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2840,18 +2829,18 @@ msgid "Systems" msgstr "시스템" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "패키지" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "패치" @@ -2877,8 +2866,8 @@ msgstr "" "십시오." #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "작업이 작업 체인에 추가되었습니다. " @@ -2892,7 +2881,7 @@ msgstr "이미지 빌드가 " #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "예약됨" @@ -2910,7 +2899,7 @@ msgid "Image Type" msgstr "이미지 유형" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "이미지 저장소" @@ -2920,7 +2909,7 @@ msgid "Path" msgstr "경로" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2935,7 +2924,7 @@ msgid "Image Profile" msgstr "이미지 프로파일" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "호스트 빌드" @@ -2947,41 +2936,41 @@ msgstr "이미지를 찾을 수 없음" msgid "The image import has been scheduled." msgstr "이미지 가져오기가 예약되었습니다." -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "이 키에 할당된 채널이 없습니다." -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "이미지 가져오기" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "이 기능을 사용해서만 컨테이너 이미지를 가져올 수 있습니다." -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "이미지 이름" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "이미지 이름은 필수입니다." -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "이미지 버전" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "이미지 버전은 필수입니다." -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "가져오기" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3168,7 +3157,7 @@ msgid "" msgstr "선택한 저장소를 삭제하시겠습니까?({0}개 저장소 선택됨)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "로그 빌드" @@ -3186,13 +3175,13 @@ msgstr "로그 빌드를 사용할 수 없습니다." #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "정보 없음" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "큐에 추가됨" @@ -3229,7 +3218,7 @@ msgstr " 실패" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "외부에서 빌드됨" @@ -3242,37 +3231,37 @@ msgid "Picked Up" msgstr "선택됨" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "클러스터" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "인스턴스" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "업데이트를 기다리는 중..." #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "클러스터 요약 보기" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "모든 인스턴스가 SUSE Manager와 일치" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "오래된 인스턴스가 발견됨" @@ -3285,32 +3274,33 @@ msgid "Edit store" msgstr "저장소 편집" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "'{0}'용 인스턴스 세부 사항" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "중요 업데이트를 사용할 수 있음" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "중요하지 않은 업데이트를 사용할 수 있음" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "패키지 업데이트를 사용할 수 있음" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "이미지가 최신임" @@ -3348,13 +3338,13 @@ msgid "Custom Image Information" msgstr "사용자 정의 이미지 정보" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "이미지 삭제" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "이미지를 삭제하시겠습니까" @@ -3456,76 +3446,76 @@ msgstr "Pod" msgid "Namespace" msgstr "네임스페이스" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "삭제되었습니다." -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "이미지 검사가 예약되었습니다." -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "이미지 빌드가 예약되었습니다." -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "이미지" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "빌드하는 중" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "알 수 없음" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "런타임" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "더 이상 사용되지 않는 항목 표시" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "리비전" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "(사용되지 않음)" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "업데이트" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "마지막으로 수정된 날짜" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "선택한 이미지 삭제" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "선택한 이미지를 삭제하시겠습니까?" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "선택한 이미지를 삭제하시겠습니까?({0}개 이미지 선택됨)" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "개요" @@ -4057,7 +4047,7 @@ msgstr "플레이븍 실행이" msgid "Applying the config channels has been " msgstr "구성 채널 적용이 " -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "구성" @@ -4518,9 +4508,10 @@ msgstr "2자 국가 코드" msgid "City" msgstr "시/도" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4650,7 +4641,7 @@ msgstr "반복 작업 예약" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "작업 유형" @@ -4679,22 +4670,22 @@ msgid "Frequency" msgstr "빈도" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "대상 유형" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "대상 이름" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "Minion" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "그룹" @@ -4712,15 +4703,13 @@ msgid "" msgstr "" "아래 시간은 서버 시간대 {0}에 표시됩니다. 예약된 시간은 서버 시간이 됩니다." -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "작업 유형 선택" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" -msgstr "대상 유형 선택" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "Highstate" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "사용자 정의 상태" @@ -4980,60 +4969,41 @@ msgid "" msgstr "" "이 활성화 키를 사용하여 등록된 모든 시스템이 선택한 하위 채널에 등록됩니다." -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "시스템 이름" +msgid " Systems " +msgstr "시스템" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "시스템" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "패키지" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 #, fuzzy msgid "Config Diffs" msgstr "구성 URL" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "기본 채널" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "저장소 유형" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -#, fuzzy -msgid "Registered Days" -msgstr "등록된 시스템" - -#: ../html/src/manager/systems/all-list.tsx:32 -#, fuzzy -msgid "Groups" -msgstr "그룹" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "시스템" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "시스템" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "오류 세부 정보" @@ -5076,6 +5046,7 @@ msgid "Loading SSH Private Key.." msgstr "SSH 개인 키를 로드하는 중..." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "부트스트랩" @@ -5175,12 +5146,12 @@ msgstr "정리 시간이 초과되었습니다. 머신에 연결할 수 있는 msgid "No result found in state apply response." msgstr "상태 적용 응답에서 결과를 찾을 수 없습니다." -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "정리하지 않고 프로파일 삭제" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "정리 중 오류 발생" @@ -5225,6 +5196,120 @@ msgstr "데이터베이스 비밀번호 보고 생성" msgid "Confirm Deletion" msgstr "삭제 확인" +#: ../html/src/manager/systems/list-filter.tsx:4 +#, fuzzy +msgid "Manager Server" +msgstr "Manager" + +#: ../html/src/manager/systems/list-filter.tsx:5 +#, fuzzy +msgid "Physical" +msgstr "물리적 기능" + +#: ../html/src/manager/systems/list-filter.tsx:12 +#, fuzzy +msgid "Ansible Control Node" +msgstr "Ansible 제어 노드" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "호스트 빌드" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "관리 노드" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "호스트 빌드" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "가상 호스트" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "예약됨" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "채널 변경이 예약되었습니다." + +#: ../html/src/manager/systems/list-filter.tsx:27 +#, fuzzy +msgid "Kickstart in progress" +msgstr " 진행 중" + +#: ../html/src/manager/systems/list-filter.tsx:28 +#, fuzzy +msgid "System is up to date" +msgstr "이미지가 최신임" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "시스템 잠김" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +#, fuzzy +msgid "Updates available" +msgstr "패키지 업데이트를 사용할 수 있음" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "예" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "아니요" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "시스템 이름" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +#, fuzzy +msgid "Registered Days" +msgstr "등록된 시스템" + +#: ../html/src/manager/systems/list-filter.tsx:52 +#, fuzzy +msgid "Groups" +msgstr "그룹" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "미니언 목록을 선택하십시오(프록시나 기존 클라이언트 제외)." @@ -5329,12 +5414,12 @@ msgid "Desired base Channel" msgstr "올바른 기본 채널" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "SUSE 채널" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "사용자 정의 채널" @@ -5420,28 +5505,28 @@ msgstr "채널 변경 사항 작업" msgid "Scheduled" msgstr "예약됨" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "알 수 없는 오류가 발생했습니다. 채널 변경을 예약하지 못했습니다." -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "일부 변경이 예약되었습니다." -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "채널 변경이 예약되었습니다." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "(없음, 서비스 비활성화)" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "채널 변경이 " -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " @@ -5450,7 +5535,7 @@ msgstr "" "시스템이 가입한 기본 소프트웨어 채널 시스템을 변경할 수 있습니다. 모든 소프트" "웨어 채널에서 시스템의 가입이 취소되고 새 기본 소프트웨어 채널에 가입합니다." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " @@ -5459,14 +5544,14 @@ msgstr "" "이 시스템은 아래에 선택한 채널에 가입되었습니다(있는 경우). 비활성화된 확인란" "은 채널에 수동으로 가입 또는 가입 취소할 수 없음을 나타냅니다." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "사용할 수 있는 하위 채널이 없습니다." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "소프트웨어 채널 변경 확인" @@ -6302,14 +6387,6 @@ msgstr "풀 또는 볼륨 이름을 기준으로 필터링" msgid "Partition separator" msgstr "파티션 구분자" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "예" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "아니요" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "호스트 이름" @@ -6551,6 +6628,18 @@ msgstr "리소스를 찾을 수 없음" msgid "HTTP Error code " msgstr "HTTP 오류 코드 " +#~ msgid " for the changes to take effect." +#~ msgstr " 구성 옵션을 편집하십시오." + +#~ msgid "Formula saved. Apply the " +#~ msgstr "수식이 저장되었습니다. 다음을 적용: " + +#~ msgid "Select an Action Type" +#~ msgstr "작업 유형 선택" + +#~ msgid "Select a Target Type" +#~ msgstr "대상 유형 선택" + #~ msgid "The action has been {0}." #~ msgstr "작업이 {0}되었습니다." @@ -6722,9 +6811,6 @@ msgstr "HTTP 오류 코드 " #~ msgid "Edit properties" #~ msgstr "속성 편집" -#~ msgid "Management node" -#~ msgstr "관리 노드" - #~ msgid "System group" #~ msgstr "시스템 그룹" diff --git a/web/po/pt.po b/web/po/pt.po index 5cbe6b5eb332..7e2ea09b7abd 100644 --- a/web/po/pt.po +++ b/web/po/pt.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2021-10-15 12:11+0000\n" "Last-Translator: Ricardo Mateus \n" "Language-Team: Portuguese Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2744,18 +2731,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2779,8 +2766,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2794,7 +2781,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2812,7 +2799,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2822,7 +2809,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2837,7 +2824,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2849,41 +2836,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3068,7 +3055,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3086,13 +3073,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3129,7 +3116,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3142,37 +3129,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3185,31 +3172,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3247,13 +3235,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3355,75 +3343,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3933,7 +3921,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4387,9 +4375,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4519,7 +4508,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4546,22 +4535,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4575,15 +4564,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4839,52 +4826,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4924,6 +4895,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5013,12 +4985,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5063,6 +5035,105 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Organização" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5159,12 +5230,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5246,49 +5317,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6117,14 +6188,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/pt_BR.po b/web/po/pt_BR.po index adafe85d58dd..f82a883be852 100644 --- a/web/po/pt_BR.po +++ b/web/po/pt_BR.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2021-03-07 04:47+0000\n" "Last-Translator: Rodrigo Macedo \n" "Language-Team: Portuguese (Brazil) Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" +"Fórmula salva. A aplicação do estado-alto não é necessária para esta fórmula." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2789,18 +2778,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2824,8 +2813,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2839,7 +2828,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2857,7 +2846,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2867,7 +2856,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2882,7 +2871,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2894,41 +2883,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3117,7 +3106,7 @@ msgstr "" "Tem certeza de que deseja {0} os {1}s selecionados? ({2} {1}s selecionados)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3135,13 +3124,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3178,7 +3167,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3191,37 +3180,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3234,31 +3223,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3296,13 +3286,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3404,77 +3394,77 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" "Tem certeza de que deseja {0} os {1}s selecionados? ({2} {1}s selecionados)" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3991,7 +3981,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4454,9 +4444,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4588,7 +4579,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4615,23 +4606,23 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 #, fuzzy msgid "Target Name" msgstr "Sobrenome" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4645,17 +4636,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -#, fuzzy -msgid "Select an Action Type" -msgstr "Selecionar uma agenda" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -#, fuzzy -msgid "Select a Target Type" -msgstr "Selecionar uma agenda" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 #, fuzzy msgid "Custom State" msgstr "Formato de quartzo personalizado:" @@ -4918,56 +4905,39 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" +msgid " Systems " msgstr "Sistemas" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "Sistemas" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "Sistemas" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "Sistemas" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "Sistemas" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -5007,6 +4977,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5096,12 +5067,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5148,6 +5119,107 @@ msgstr "Gerar nova senha" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Sistemas" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "Sistemas" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "Sistemas" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5245,12 +5317,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5332,49 +5404,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6208,14 +6280,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" @@ -6456,6 +6520,14 @@ msgstr "" msgid "HTTP Error code " msgstr "" +#, fuzzy +#~ msgid "Select an Action Type" +#~ msgstr "Selecionar uma agenda" + +#, fuzzy +#~ msgid "Select a Target Type" +#~ msgstr "Selecionar uma agenda" + #~ msgid "Page" #~ msgstr "Página" diff --git a/web/po/si.po b/web/po/si.po index ac61053cc135..088b0a0e0a4c 100644 --- a/web/po/si.po +++ b/web/po/si.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -48,25 +48,25 @@ msgstr "" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -146,8 +146,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -164,9 +164,9 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -210,7 +210,7 @@ msgid "Save" msgstr "" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "" @@ -282,11 +282,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -319,19 +319,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "" @@ -380,7 +380,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -492,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -600,10 +600,12 @@ msgid "Unprovisioned System" msgstr "" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -614,6 +616,7 @@ msgstr "" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -632,12 +635,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -650,7 +653,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -659,6 +662,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -679,8 +687,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -804,8 +812,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -866,29 +874,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -896,38 +904,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -973,7 +981,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1011,8 +1019,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1117,35 +1125,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1178,65 +1186,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1244,104 +1252,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1498,7 +1506,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1515,7 +1523,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2002,7 +2010,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2091,7 +2099,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2337,12 +2345,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2365,7 +2367,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2456,13 +2458,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2596,7 +2598,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2622,7 +2624,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2634,7 +2636,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2697,40 +2699,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2739,18 +2726,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2774,8 +2761,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2789,7 +2776,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2807,7 +2794,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2817,7 +2804,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2832,7 +2819,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2844,41 +2831,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3063,7 +3050,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3081,13 +3068,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3124,7 +3111,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3137,37 +3124,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3180,31 +3167,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3242,13 +3230,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3350,75 +3338,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3928,7 +3916,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4382,9 +4370,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4513,7 +4502,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4540,22 +4529,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4569,15 +4558,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4833,52 +4820,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4918,6 +4889,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5007,12 +4979,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5057,6 +5029,104 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +msgid "Virtualization Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5153,12 +5223,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5240,49 +5310,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6111,14 +6181,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/sk.po b/web/po/sk.po index cebc831dbaed..213d6447b13e 100644 --- a/web/po/sk.po +++ b/web/po/sk.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2023-06-25 15:15+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak \n" @@ -54,7 +54,7 @@ msgstr "Prosím, zadajte požadované polia: {0}" msgid "Invalid format of fields: {fields}" msgstr "Neplatný formát polí: {0}" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." @@ -62,19 +62,19 @@ msgstr "" "Na tejto stránke môžete nakonfigurovať vzorce Salt na automatickú inštaláciu " "a konfiguráciu softvéru." -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "Rozbaliť všetky sekcie" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "Zbaliť všetky sekcie" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "Bez názvu" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "Hľadať podľa názvu skupiny vzorca" @@ -159,8 +159,8 @@ msgstr "Naozaj chcete {0} vybrané položky {1}? ({2} položiek {1} vybraných)" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -177,9 +177,9 @@ msgstr "Zrušiť" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -226,7 +226,7 @@ msgid "Save" msgstr "Uložiť" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "Vzorce" @@ -302,11 +302,11 @@ msgstr "Nie je možné vykonať akciu." #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "Potvrdiť" @@ -339,19 +339,19 @@ msgstr "Prvá" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "Predchádzajúce" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "Nasledujúca" @@ -401,7 +401,7 @@ msgstr "Sobota" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "Názov plánu" @@ -518,8 +518,8 @@ msgstr "" "vyhľadávanie." #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -631,10 +631,12 @@ msgid "Unprovisioned System" msgstr "Neposkytnutý systém" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "Virtuálny hosť" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "Virtuálny hostiteľ" @@ -645,6 +647,7 @@ msgstr "Nevirtuálny systém" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "Proxy" @@ -663,12 +666,12 @@ msgid "System Locked" msgstr "Systém uzamknutý" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "Filter" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "Vybrať filter" @@ -683,7 +686,7 @@ msgid "({selectedCount} selected)" msgstr "Vymazať vybrané" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "Vyčistiť" @@ -692,6 +695,11 @@ msgstr "Vyčistiť" msgid "Select All" msgstr "Vybrať všetko" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "Všetky" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "položiek na stránku" @@ -712,8 +720,8 @@ msgstr "Pomocník" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -850,8 +858,8 @@ msgstr "Vyskytla sa chyba. Stav monitorovania nie je známy. Obnovte stránku." #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -912,29 +920,29 @@ msgstr "dokumentácia" msgid " to learn how to consume these metrics." msgstr " naučiť sa, ako tieto metriky využívať." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "Povoliť" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "Zakázať" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "Konfigurácia SUSE Manager - Monitorovanie" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "Nastavte monitorovanie svojho servera SUSE Manager." -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -942,38 +950,38 @@ msgstr "Nastavte monitorovanie svojho servera SUSE Manager." msgid "General" msgstr "Všeobecné" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "Zavádzací skript" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "Organizácie" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "Reštart" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "Cobbler" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "Systémy Bare-metal" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "Monitorovanie" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "Reštartovanie" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -1020,7 +1028,7 @@ msgid "Bastion SSH connection data" msgstr "Dáta pripojenia bašty SSH" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "Sprievodca nastavením" @@ -1058,8 +1066,8 @@ msgid "never" msgstr "nikdy" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "z" @@ -1169,35 +1177,35 @@ msgstr "Vymazať priebežnú platbu" msgid "Are you sure you want to delete project" msgstr "Naozaj chcete vymazať projekt" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "Obnoviť katalóg produktov zo Zákazníckeho centra SUSE" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "Obnoviť" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "Prosím, buďte trpezliví, môže to trvať niekoľko minút." -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "Dokončené" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "Operácia nebola úspešná: Prázdna odpoveď zo servera" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1237,7 +1245,7 @@ msgstr "" "Nasledujúce inštalácie kanálov pre '{product}' zlyhali. Skontrolujte, " "prosím, súbory záznamov." -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." @@ -1245,28 +1253,28 @@ msgstr "" "Obnovovanie produktových údajov momentálne beží na pozadí. Skúste znova " "neskôr, prosím." -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "Katalóg produktov sa stále obnovuje, čakajte, prosím." -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "Najskôr vyberte nejaký produkt." -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "Pridať produkty" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "Vymazať výber produktov" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "Prečo nie sú v zozname zobrazené všetky produkty?" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." @@ -1275,7 +1283,7 @@ msgstr "" "vašej organizácie (prihlasovacími údajmi zrkadla) ako aj s vašimi " "predplatnými SUSE." -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." @@ -1283,7 +1291,7 @@ msgstr "" "Ak sa domnievate, že niektoré produkty chýbajú, uistite sa, že ste pridali " "správne prihlasovacie údaje organizácie v predchádzajúcom kroku sprievodcu." -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." @@ -1291,20 +1299,20 @@ msgstr "" "Tento server je nakonfigurovaný ako podriadený Inter-Server Synchronisation " "(ISS). Produkty je možné spravovať iba na hlavnom serveri ISS." -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "Filtrovať podľa architektúry" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "Filtrovať podľa popisu produktu" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "Popis produktu" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1312,106 +1320,106 @@ msgstr "Popis produktu" msgid "Architecture" msgstr "Architektúra" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "Arch" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "Kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr " synchronizácia kanálov zlyhala" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr " prebieha synchronizácia kanálov" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr " kanály synchronizované" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" "Ak chcete povoliť tento produkt, najskôr by mal byť vybraný rodičovský " "produkt" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "Vybrať tento produkt" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "Tento produkt je zrkadlený." -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "odporúčané" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "zahrnúť odporúčané" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "Prebieha obnovovanie katalógu výrobkov SCC" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "Plánovanie opätovnej synchronizácie produktov kanálov" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "Opätovná synchronizácia produktov kanálov naplánovaná" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "Naplánovať opätovnú synchronizáciu produktov kanálov" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "Zobraziť kanály produktu" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "Kanály produktov - " -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "Vyberte voliteľné kanály, ktoré chcete pridať, a potvrďte." -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "Povinné kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "Voliteľné kanály" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "nesynchronizované" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "prebieha synchronizácia" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "synchronizované" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "synchronizácia zlyhala" @@ -1572,7 +1580,7 @@ msgstr "Odkaz SUSE Security CVE" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1589,7 +1597,7 @@ msgstr "Názov" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2107,7 +2115,7 @@ msgstr "Obdobie" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "Verzia" @@ -2197,7 +2205,7 @@ msgstr "Vybrať nepoužité" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "Vymazať vybrané" @@ -2444,12 +2452,6 @@ msgstr "Obsahuje balík poskytujúci názov" msgid "Contains Package" msgstr "Obsahuje balík" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "Všetky" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "Názov balíka opráv" @@ -2473,7 +2475,7 @@ msgstr "Zostaviť ({0})" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "Zostaviť" @@ -2573,13 +2575,13 @@ msgid "Waiting for repositories data to be generated" msgstr "Čakanie na vygenerovanie dát repozitárov" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "Zostavené" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "Neúspešné" @@ -2717,7 +2719,7 @@ msgstr "Vybrať kanál, ktorý sa má zvoliť ako nový základný kanál" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "Kanály potomkov" @@ -2743,7 +2745,7 @@ msgstr "Tento kanál je povinný" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "povinné" @@ -2755,7 +2757,7 @@ msgstr "žiadne kanály potomkov" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2829,43 +2831,30 @@ msgstr "" "Použitie konfiguračných kanálov bolo naplánované pre každý server minion v " "tejto skupine" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 +#, fuzzy msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " +"the Highstate for the changes to take effect." msgstr "" "Vzorec bol uložený. Upraviť možnosti konfigurácie v povolených vzorcoch a " "použiť " -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "Highstate" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr " aby sa prejavili zmeny." - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "Neplatný typ cieľa." -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " -msgstr "Vzorec bol uložený. Použiť " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." +msgstr "Vzorec bol uložený. Pre tento vzorec nie je potrebné použiť highstate." #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2873,18 +2862,18 @@ msgid "Systems" msgstr "Systémy" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "Balíky" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "Opravy" @@ -2910,8 +2899,8 @@ msgstr "" "plánovač úloh." #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "Akcia bola úspešne pridaná do Reťazca akcií " @@ -2925,7 +2914,7 @@ msgstr "Zostavenie obrazu bolo " #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "naplánované" @@ -2943,7 +2932,7 @@ msgid "Image Type" msgstr "Typ obrazu" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "Úložisko obrazov" @@ -2953,7 +2942,7 @@ msgid "Path" msgstr "Cesta" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2968,7 +2957,7 @@ msgid "Image Profile" msgstr "Profil obrazu" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "Zostaviť hostiteľa" @@ -2980,41 +2969,41 @@ msgstr "Úložisko obrazov sa nenašlo" msgid "The image import has been scheduled." msgstr "Import obrazu bol naplánovaný." -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "Tomuto kľúču nie sú priradené žiadne kanály." -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "Importovať obraz" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "Obrazy kontajnerov môžete importovať iba pomocou tejto funkcie." -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "Názov obrazu" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "Vyžaduje sa názov obrazu." -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "Verzia obrazu" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "Vyžaduje sa verzia obrazu." -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "Import" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3203,7 +3192,7 @@ msgid "" msgstr "Naozaj chcete vymazať vybrané úložiská? ({0} vybraných úložísk)" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "Záznam o zostavení" @@ -3221,13 +3210,13 @@ msgstr "Nie je k dispozícii záznam o zostavení." #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "Žiadne informácie" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "Zaradené" @@ -3264,7 +3253,7 @@ msgstr " zlyhalo" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "Zostavené externe" @@ -3277,37 +3266,37 @@ msgid "Picked Up" msgstr "Vyzdvihnuté" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "Klaster" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "Inštancie" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "Čaká sa na aktualizáciu ..." #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "Zobraziť súhrn klastrov" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "Všetky inštancie sú v súlade so SUSE Manager" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "Boli nájdené zastarané inštancie" @@ -3320,32 +3309,33 @@ msgid "Edit store" msgstr "Upraviť úložisko" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "Podrobnosti inštancie pre '{0}'" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "K dispozícii sú kritické aktualizácie" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "K dispozícii sú nekritické aktualizácie" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "K dispozícii sú aktualizácie balíkov" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "Obraz je aktuálny" @@ -3383,13 +3373,13 @@ msgid "Custom Image Information" msgstr "Informácie o vlastnom obraze" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "Vymazať obraz" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "Naozaj chcete vymazať obraz" @@ -3491,76 +3481,76 @@ msgstr "Zhluk" msgid "Namespace" msgstr "Menný priestor" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "Úspešne vymazané." -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "Bola naplánovaná kontrola obrazu." -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "Zostavenie obrazu bolo naplánované." -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "Obrazy" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "Zostavovanie" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "Neznáme" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "Beh programu" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "Zobraziť zastarané" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "Revízia" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "(zastarané)" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "Aktualizácie" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "Naposledy zmenené" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "Vymazať vybrané obraz(y)" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "Naozaj chcete vymazať vybraný obraz?" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "Naozaj chcete vymazať vybrané obrazy? ({0} vybraných obrazov)" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "Prehľad" @@ -4102,7 +4092,7 @@ msgstr "Vykonanie scenára bolo" msgid "Applying the config channels has been " msgstr "Použitie konfiguračných kanálov bolo " -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "Konfigurácia" @@ -4569,9 +4559,10 @@ msgstr "Dvojpísmenový kód krajiny" msgid "City" msgstr "Mesto" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4701,7 +4692,7 @@ msgstr "Naplánovať opakujúcu sa akciu" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "Typ akcie" @@ -4730,22 +4721,22 @@ msgid "Frequency" msgstr "Frekvencia" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "Typ cieľa" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "Názov cieľa" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "Minion" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "Skupina" @@ -4762,15 +4753,13 @@ msgstr "" "Nižšie uvedené časy sa zobrazujú v časovom pásme servera {0}. Naplánovaný " "čas bude časom servera." -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "Vybrať typ akcie" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" -msgstr "Vybrať typ cieľa" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "Highstate" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "Vlastný stav" @@ -5031,52 +5020,36 @@ msgstr "" "Akýkoľvek systém zaregistrovaný pomocou tohto aktivačného kľúča bude " "prihlásený k vybraným kanálom potomkov." -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" -msgstr "Druh systému" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " +msgstr " Systémy " -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "Žiadne systémy." + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "Extra balíky" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "Konfiguračné rozdiely" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "Základný kanál" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "Typ systému" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "Vyžaduje reštart" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "Registrované dni" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "Skupiny" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr " Systémy " - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "Žiadne systémy." - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "Podrobnosti o chybách" @@ -5122,6 +5095,7 @@ msgid "Loading SSH Private Key.." msgstr "Načítava sa súkromný kľúč SSH..." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "Zavádzať" @@ -5224,12 +5198,12 @@ msgstr "Vyčistenie vypršalo. Prosím, skontrolujte, či je stroj dosiahnuteľn msgid "No result found in state apply response." msgstr "V odpovedi aplikácie stavu sa nenašiel žiadny výsledok." -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "Vymazať profil bez vyčistenia" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "Počas čistenia sa vyskytla chyba" @@ -5274,6 +5248,118 @@ msgstr "Znovu vygenerovať heslo databázy správ" msgid "Confirm Deletion" msgstr "Potvrdiť vymazanie" +#: ../html/src/manager/systems/list-filter.tsx:4 +#, fuzzy +msgid "Manager Server" +msgstr "Manager" + +#: ../html/src/manager/systems/list-filter.tsx:5 +#, fuzzy +msgid "Physical" +msgstr "Fyzická funkcia" + +#: ../html/src/manager/systems/list-filter.tsx:12 +#, fuzzy +msgid "Ansible Control Node" +msgstr "Riadiaci uzol Ansible" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "Zostaviť hostiteľa" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "Uzol správy" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "Zostaviť hostiteľa" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "Virtuálny hostiteľ" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "naplánované" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "Zmeny kanálov naplánované." + +#: ../html/src/manager/systems/list-filter.tsx:27 +#, fuzzy +msgid "Kickstart in progress" +msgstr " prebieha" + +#: ../html/src/manager/systems/list-filter.tsx:28 +#, fuzzy +msgid "System is up to date" +msgstr "Obraz je aktuálny" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "Systém uzamknutý" + +#: ../html/src/manager/systems/list-filter.tsx:31 +#, fuzzy +msgid "System requires reboot" +msgstr "Vyžaduje reštart" + +#: ../html/src/manager/systems/list-filter.tsx:32 +#, fuzzy +msgid "Updates available" +msgstr "K dispozícii sú aktualizácie balíkov" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "Áno" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "Nie" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "Druh systému" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "Vyžaduje reštart" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "Registrované dni" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "Skupiny" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5379,12 +5465,12 @@ msgid "Desired base Channel" msgstr "Požadovaný základný kanál" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "Kanály SUSE" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "Vlastné kanály" @@ -5472,28 +5558,28 @@ msgstr "Akcie zmien kanálov" msgid "Scheduled" msgstr "Naplánované" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "Neznáma chyba. Nepodarilo sa naplánovať zmenu kanála" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "Niektoré zmeny boli úspešne naplánované." -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "Zmeny kanálov naplánované." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "(žiadne, zakázať službu)" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "Zmena kanálov bola " -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " @@ -5503,7 +5589,7 @@ msgstr "" "prihlásený. Systém bude odhlásený zo všetkých softvérových kanálov a bude " "prihlásený k novému základnému softvérovému kanálu." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " @@ -5513,14 +5599,14 @@ msgstr "" "sú. Zablokované zaškrtávacie polia označujú kanály, ku ktorým nie je možné " "sa ručne prihlásiť alebo odhlásiť." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "Nie sú k dispozícii žiadne kanály potomkov." -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "Potvrďte zmenu softvérového kanála" @@ -6366,14 +6452,6 @@ msgstr "Filtrovať podľa názvu zväzku alebo fondu" msgid "Partition separator" msgstr "Oddeľovač oddielov" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "Áno" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "Nie" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "Názov hostiteľa" @@ -6618,6 +6696,18 @@ msgstr "Zdroj sa nenašiel." msgid "HTTP Error code " msgstr "Kód chyby HTTP " +#~ msgid " for the changes to take effect." +#~ msgstr " aby sa prejavili zmeny." + +#~ msgid "Formula saved. Apply the " +#~ msgstr "Vzorec bol uložený. Použiť " + +#~ msgid "Select an Action Type" +#~ msgstr "Vybrať typ akcie" + +#~ msgid "Select a Target Type" +#~ msgstr "Vybrať typ cieľa" + #~ msgid "The action has been {0}." #~ msgstr "Akcia bola {0}." @@ -6793,9 +6883,6 @@ msgstr "Kód chyby HTTP " #~ msgid "Edit properties" #~ msgstr "Upraviť vlastnosti" -#~ msgid "Management node" -#~ msgstr "Uzol správy" - #~ msgid "System group" #~ msgstr "Systémová skupina" diff --git a/web/po/spacewalk-web.pot b/web/po/spacewalk-web.pot index 0c007ed0a537..6c2699dc583b 100644 --- a/web/po/spacewalk-web.pot +++ b/web/po/spacewalk-web.pot @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -49,25 +49,25 @@ msgstr "" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -147,8 +147,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -165,9 +165,9 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -211,7 +211,7 @@ msgid "Save" msgstr "" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "" @@ -283,11 +283,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -320,19 +320,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "" @@ -381,7 +381,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -493,8 +493,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -601,10 +601,12 @@ msgid "Unprovisioned System" msgstr "" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -615,6 +617,7 @@ msgstr "" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -633,12 +636,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -651,7 +654,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -660,6 +663,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -680,8 +688,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -805,8 +813,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -867,29 +875,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -897,38 +905,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -974,7 +982,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1012,8 +1020,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1118,35 +1126,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1179,65 +1187,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1245,104 +1253,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1499,7 +1507,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1516,7 +1524,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2003,7 +2011,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2092,7 +2100,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2338,12 +2346,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2366,7 +2368,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2457,13 +2459,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2597,7 +2599,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2623,7 +2625,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2635,7 +2637,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2698,40 +2700,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2740,18 +2727,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2775,8 +2762,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2790,7 +2777,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2808,7 +2795,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2818,7 +2805,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2833,7 +2820,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2845,41 +2832,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3064,7 +3051,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3082,13 +3069,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3125,7 +3112,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3138,37 +3125,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3181,31 +3168,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3243,13 +3231,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3351,75 +3339,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3929,7 +3917,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4383,9 +4371,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4514,7 +4503,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4541,22 +4530,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4570,15 +4559,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4834,52 +4821,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4919,6 +4890,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5008,12 +4980,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5058,6 +5030,104 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +msgid "Virtualization Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5154,12 +5224,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5241,49 +5311,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6112,14 +6182,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/zh_CN.po b/web/po/zh_CN.po index d730c662fabd..14f189c25875 100644 --- a/web/po/zh_CN.po +++ b/web/po/zh_CN.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: 2023-06-26 04:15+0000\n" "Last-Translator: Grace Yu \n" "Language-Team: Chinese (China) Highstate for the changes to take effect." msgstr "已保存公式。请编辑已启用公式中的配置选项并应用 " -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "Highstate" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." -msgstr " 以使更改生效。" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "无效目标类型。" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " -msgstr "已保存公式。请应用 " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +#, fuzzy +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." +msgstr "公式已保存。无需对此公式应用 highstate。" #: ../html/src/manager/header/search/search.tsx:10 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:183 @@ -2788,18 +2777,18 @@ msgid "Systems" msgstr "系统" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "软件包" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "补丁" @@ -2823,8 +2812,8 @@ msgid "" msgstr "安排任务时出错。请确保任务日程安排程序正在运行。" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "操作已成功添加到操作链 " @@ -2838,7 +2827,7 @@ msgstr "映像构建 " #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "已安排" @@ -2856,7 +2845,7 @@ msgid "Image Type" msgstr "映像类型" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "映像储存" @@ -2866,7 +2855,7 @@ msgid "Path" msgstr "路径" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2881,7 +2870,7 @@ msgid "Image Profile" msgstr "映像配置文件" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "构建主机" @@ -2893,41 +2882,41 @@ msgstr "找不到映像储存" msgid "The image import has been scheduled." msgstr "已安排映像导入。" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "未将任何通道指派到此密钥。" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "导入映像" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "使用此功能只能导入容器映像。" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "映像名称" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "映像名称是必填的。" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "映像版本" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "映像版本是必填的。" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "导入" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3114,7 +3103,7 @@ msgid "" msgstr "您确定要删除选定的存储区吗？（已选择 {0} 个存储区）" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "构建日志" @@ -3132,13 +3121,13 @@ msgstr "无可用构建日志。" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "无信息" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "已排队" @@ -3175,7 +3164,7 @@ msgstr " 失败" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "已在外部构建" @@ -3188,37 +3177,37 @@ msgid "Picked Up" msgstr "已提取" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "群集" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "实例" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "正在等待更新..." #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "查看群集摘要" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "所有实例与 SUSE Manager 相一致" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "找到已过时的实例" @@ -3231,32 +3220,33 @@ msgid "Edit store" msgstr "编辑储存" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 #, fuzzy msgid "Instance Details for '{name}'" msgstr "'{0}' 的实例细节" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "有关键更新可用" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "有非关键更新可用" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "有软件包更新可用" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "映像是最新的" @@ -3294,13 +3284,13 @@ msgid "Custom Image Information" msgstr "自定义映像信息" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "删除映像" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "您确定要删除映像吗" @@ -3402,76 +3392,76 @@ msgstr "Pod" msgid "Namespace" msgstr "名称空间" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "已成功删除。" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "已安排映像检查。" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "已安排映像构建。" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "映像" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "正在构建" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "未知" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "运行时" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "显示过时项" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "修订版" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "（过时）" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "更新" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "上次修改时间" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "删除选定的映像" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "您确定要删除选定的映像吗？" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 #, fuzzy msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "您确定要删除选定的映像吗？（已选择 {0} 个映像）" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "概览" @@ -3986,7 +3976,7 @@ msgstr "剧本的执行已" msgid "Applying the config channels has been " msgstr "应用配置通道 " -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "配置" @@ -4443,9 +4433,10 @@ msgstr "2 位字母国家/地区代码" msgid "City" msgstr "城市" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4575,7 +4566,7 @@ msgstr "安排重复性操作" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "操作类型" @@ -4602,22 +4593,22 @@ msgid "Frequency" msgstr "频率" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "目标类型" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "目标名称" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "受控端" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "组" @@ -4632,15 +4623,13 @@ msgid "" "scheduled time will be the server time." msgstr "服务器时区 {0} 中会显示以下时间。安排的时间将会是服务器时间。" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "选择操作类型" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" -msgstr "选择目标类型" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" +msgstr "Highstate" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "自定义状态" @@ -4899,60 +4888,41 @@ msgid "" "selected child channels." msgstr "使用此激活密钥注册的所有系统都将订阅所选子通道。" -#: ../html/src/manager/systems/all-list.tsx:22 +#: ../html/src/manager/systems/all-list.tsx:37 #, fuzzy -msgid "System Kind" -msgstr "系统名称" +msgid " Systems " +msgstr "系统" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +#, fuzzy +msgid "No Systems." +msgstr "系统" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 #, fuzzy msgid "Extra Packages" msgstr "软件包" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 #, fuzzy msgid "Config Diffs" msgstr "配置 URL" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "基础通道" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 #, fuzzy msgid "System Type" msgstr "储存类型" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -#, fuzzy -msgid "Registered Days" -msgstr "已注册的系统" - -#: ../html/src/manager/systems/all-list.tsx:32 -#, fuzzy -msgid "Groups" -msgstr "组" - -#: ../html/src/manager/systems/all-list.tsx:51 -#, fuzzy -msgid " Systems " -msgstr "系统" - -#: ../html/src/manager/systems/all-list.tsx:71 -#, fuzzy -msgid "No Systems." -msgstr "系统" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "错误细节" @@ -4994,6 +4964,7 @@ msgid "Loading SSH Private Key.." msgstr "正在装载 SSH 私用密钥..." #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "引导" @@ -5089,12 +5060,12 @@ msgstr "清理操作超时。请检查计算机是否可访问。" msgid "No result found in state apply response." msgstr "在状态应用响应中未找到结果。" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "删除配置文件但不清理" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "清理期间出错" @@ -5139,6 +5110,120 @@ msgstr "重新生成报告数据库口令" msgid "Confirm Deletion" msgstr "确认删除" +#: ../html/src/manager/systems/list-filter.tsx:4 +#, fuzzy +msgid "Manager Server" +msgstr "Manager" + +#: ../html/src/manager/systems/list-filter.tsx:5 +#, fuzzy +msgid "Physical" +msgstr "物理功能" + +#: ../html/src/manager/systems/list-filter.tsx:12 +#, fuzzy +msgid "Ansible Control Node" +msgstr "Ansible 控制节点" + +#: ../html/src/manager/systems/list-filter.tsx:14 +#, fuzzy +msgid "Container Build Host" +msgstr "构建主机" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +#, fuzzy +msgid "Management" +msgstr "管理节点" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +#, fuzzy +msgid "OS Image Build Host" +msgstr "构建主机" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +#, fuzzy +msgid "Virtualization Host" +msgstr "虚拟主机" + +#: ../html/src/manager/systems/list-filter.tsx:24 +#, fuzzy +msgid "Actions scheduled" +msgstr "已安排" + +#: ../html/src/manager/systems/list-filter.tsx:25 +#, fuzzy +msgid "All updates scheduled" +msgstr "已安排通道更改。" + +#: ../html/src/manager/systems/list-filter.tsx:27 +#, fuzzy +msgid "Kickstart in progress" +msgstr " 正在进行" + +#: ../html/src/manager/systems/list-filter.tsx:28 +#, fuzzy +msgid "System is up to date" +msgstr "映像是最新的" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +#, fuzzy +msgid "System not entitled" +msgstr "系统已锁定" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +#, fuzzy +msgid "Updates available" +msgstr "有软件包更新可用" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "是" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "否" + +#: ../html/src/manager/systems/list-filter.tsx:42 +#, fuzzy +msgid "System Kind" +msgstr "系统名称" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +#, fuzzy +msgid "Registered Days" +msgstr "已注册的系统" + +#: ../html/src/manager/systems/list-filter.tsx:52 +#, fuzzy +msgid "Groups" +msgstr "组" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "请选择受控端（不是代理或传统客户端）列表。" @@ -5239,12 +5324,12 @@ msgid "Desired base Channel" msgstr "所需基础通道" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "SUSE 通道" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "自定义通道" @@ -5326,28 +5411,28 @@ msgstr "通道更改操作" msgid "Scheduled" msgstr "已安排" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "未知错误。无法安排通道更改" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "已成功安排某些更改。" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "已安排通道更改。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "（无，禁用服务）" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "更改通道 " -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " @@ -5356,7 +5441,7 @@ msgstr "" "您可以更改系统订阅的基础软件通道。该系统将取消订阅所有软件通道，然后订阅新的" "基础软件通道。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " @@ -5365,14 +5450,14 @@ msgstr "" "此系统已订阅下面选中的通道（如果有）。已禁用的复选框表示相应的通道不可手动订" "阅或取消订阅。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "无可用子通道。" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "确认软件通道更改" @@ -6204,14 +6289,6 @@ msgstr "按池或卷名称过滤" msgid "Partition separator" msgstr "分区分隔符" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "是" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "否" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "主机名" @@ -6452,6 +6529,18 @@ msgstr "未找到资源。" msgid "HTTP Error code " msgstr "HTTP 错误代码 " +#~ msgid " for the changes to take effect." +#~ msgstr " 以使更改生效。" + +#~ msgid "Formula saved. Apply the " +#~ msgstr "已保存公式。请应用 " + +#~ msgid "Select an Action Type" +#~ msgstr "选择操作类型" + +#~ msgid "Select a Target Type" +#~ msgstr "选择目标类型" + #~ msgid "The action has been {0}." #~ msgstr "操作已{0}。" @@ -6623,9 +6712,6 @@ msgstr "HTTP 错误代码 " #~ msgid "Edit properties" #~ msgstr "编辑属性" -#~ msgid "Management node" -#~ msgstr "管理节点" - #~ msgid "System group" #~ msgstr "系统组" diff --git a/web/po/zh_HK.po b/web/po/zh_HK.po index 214c4cc033d4..13cfbd3fe81c 100644 --- a/web/po/zh_HK.po +++ b/web/po/zh_HK.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -48,25 +48,25 @@ msgstr "" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -146,8 +146,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -164,9 +164,9 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -210,7 +210,7 @@ msgid "Save" msgstr "" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "" @@ -282,11 +282,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -319,19 +319,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "" @@ -380,7 +380,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -492,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -600,10 +600,12 @@ msgid "Unprovisioned System" msgstr "" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -614,6 +616,7 @@ msgstr "" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -632,12 +635,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -650,7 +653,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -659,6 +662,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -679,8 +687,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -804,8 +812,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -866,29 +874,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -896,38 +904,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -973,7 +981,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1011,8 +1019,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1117,35 +1125,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1178,65 +1186,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1244,104 +1252,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1498,7 +1506,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1515,7 +1523,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2002,7 +2010,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2091,7 +2099,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2337,12 +2345,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2365,7 +2367,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2456,13 +2458,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2596,7 +2598,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2622,7 +2624,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2634,7 +2636,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2697,40 +2699,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2739,18 +2726,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2774,8 +2761,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2789,7 +2776,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2807,7 +2794,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2817,7 +2804,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2832,7 +2819,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2844,41 +2831,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3063,7 +3050,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3081,13 +3068,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3124,7 +3111,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3137,37 +3124,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3180,31 +3167,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3242,13 +3230,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3350,75 +3338,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3928,7 +3916,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4382,9 +4370,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4513,7 +4502,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4540,22 +4529,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4569,15 +4558,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4833,52 +4820,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4918,6 +4889,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5007,12 +4979,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5057,6 +5029,104 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +msgid "Virtualization Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5153,12 +5223,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5240,49 +5310,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6111,14 +6181,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" diff --git a/web/po/zh_TW.po b/web/po/zh_TW.po index 12f599a878ee..4ed203a036d0 100644 --- a/web/po/zh_TW.po +++ b/web/po/zh_TW.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-28 15:10+0200\n" +"POT-Creation-Date: 2023-08-04 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -48,25 +48,25 @@ msgstr "" msgid "Invalid format of fields: {fields}" msgstr "" -#: ../html/src/components/FormulaForm.tsx:216 +#: ../html/src/components/FormulaForm.tsx:213 msgid "" "On this page you can configure Salt Formulas to automatically install and " "configure software." msgstr "" -#: ../html/src/components/FormulaForm.tsx:271 +#: ../html/src/components/FormulaForm.tsx:268 msgid "Expand All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:278 +#: ../html/src/components/FormulaForm.tsx:275 msgid "Collapse All Sections" msgstr "" -#: ../html/src/components/FormulaForm.tsx:343 +#: ../html/src/components/FormulaForm.tsx:340 msgid "Unnamed" msgstr "" -#: ../html/src/components/FormulaForm.tsx:352 +#: ../html/src/components/FormulaForm.tsx:349 msgid "Search by formula's group name" msgstr "" @@ -146,8 +146,8 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:814 #: ../html/src/manager/images/image-view-overview.tsx:815 #: ../html/src/manager/minion/ansible/edit-ansible-path.tsx:20 -#: ../html/src/manager/systems/delete-system.tsx:78 -#: ../html/src/manager/systems/delete-system.tsx:79 +#: ../html/src/manager/systems/delete-system.tsx:80 +#: ../html/src/manager/systems/delete-system.tsx:81 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:62 #: ../html/src/manager/virtualization/guests/console/MessagePopUp.tsx:63 msgid "Cancel" @@ -164,9 +164,9 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:210 #: ../html/src/manager/images/image-stores.tsx:136 #: ../html/src/manager/images/image-stores.tsx:204 -#: ../html/src/manager/images/image-view.tsx:349 -#: ../html/src/manager/images/image-view.tsx:359 -#: ../html/src/manager/images/image-view.tsx:696 +#: ../html/src/manager/images/image-view.tsx:351 +#: ../html/src/manager/images/image-view.tsx:361 +#: ../html/src/manager/images/image-view.tsx:698 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:44 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:47 #: ../html/src/manager/maintenance/list/calendar-list.tsx:87 @@ -210,7 +210,7 @@ msgid "Save" msgstr "" #: ../html/src/components/formula-selection.tsx:299 -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:62 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:65 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:29 msgid "Formulas" msgstr "" @@ -282,11 +282,11 @@ msgstr "" #: ../html/src/components/package/PackageListActionScheduler.tsx:180 #: ../html/src/components/states-picker.tsx:329 -#: ../html/src/manager/admin/setup/products/products.tsx:1160 +#: ../html/src/manager/admin/setup/products/products.tsx:1162 #: ../html/src/manager/maintenance/edit/calendar-edit.tsx:187 #: ../html/src/manager/maintenance/shared/cancel-actions-dialog.tsx:16 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1126 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:675 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1130 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:677 msgid "Confirm" msgstr "" @@ -319,19 +319,19 @@ msgstr "" #: ../html/src/components/pagination.tsx:28 #: ../html/src/manager/admin/list-payg/list-payg.tsx:155 -#: ../html/src/manager/admin/setup/products/products.tsx:436 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1092 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1123 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:668 +#: ../html/src/manager/admin/setup/products/products.tsx:438 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1096 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1127 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:670 msgid "Prev" msgstr "" #: ../html/src/components/pagination.tsx:33 #: ../html/src/manager/admin/list-payg/list-payg.tsx:161 -#: ../html/src/manager/admin/setup/products/products.tsx:442 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1073 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1099 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:565 +#: ../html/src/manager/admin/setup/products/products.tsx:444 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1077 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1103 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:567 msgid "Next" msgstr "" @@ -380,7 +380,7 @@ msgstr "" #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:96 #: ../html/src/manager/maintenance/list/schedule-list.tsx:32 #: ../html/src/manager/recurring/recurring-actions-list.tsx:165 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 msgid "Schedule Name" msgstr "" @@ -492,8 +492,8 @@ msgid "No states assigned. Use search to find and assign states." msgstr "" #: ../html/src/components/states-picker.tsx:327 -#: ../html/src/manager/images/image-view.tsx:815 #: ../html/src/manager/images/image-view.tsx:817 +#: ../html/src/manager/images/image-view.tsx:819 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:29 #: ../html/src/manager/maintenance/details/maintenance-windows-details.tsx:31 #: ../html/src/manager/maintenance/edit/maintenance-windows-edit.tsx:52 @@ -600,10 +600,12 @@ msgid "Unprovisioned System" msgstr "" #: ../html/src/components/systems.tsx:26 +#: ../html/src/manager/systems/list-filter.tsx:7 msgid "Virtual Guest" msgstr "" #: ../html/src/components/systems.tsx:31 +#: ../html/src/manager/systems/list-filter.tsx:8 #: ../html/src/manager/systems/virtual-list.tsx:65 msgid "Virtual Host" msgstr "" @@ -614,6 +616,7 @@ msgstr "" #: ../html/src/components/systems.tsx:44 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:588 +#: ../html/src/manager/systems/list-filter.tsx:6 msgid "Proxy" msgstr "" @@ -632,12 +635,12 @@ msgid "System Locked" msgstr "" #: ../html/src/components/table/SearchField.tsx:49 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:43 +#: ../html/src/components/table/TableFilter.tsx:45 msgid "Filter" msgstr "" #: ../html/src/components/table/SearchField.tsx:53 -#: ../html/src/manager/recurring/search/recurring-actions-search.tsx:47 +#: ../html/src/components/table/TableFilter.tsx:49 msgid "Select a filter" msgstr "" @@ -650,7 +653,7 @@ msgid "({selectedCount} selected)" msgstr "" #: ../html/src/components/table/SearchPanel.tsx:64 -#: ../html/src/manager/admin/setup/products/products.tsx:363 +#: ../html/src/manager/admin/setup/products/products.tsx:365 #: ../html/src/manager/systems/ssm/ssm-counter.tsx:34 msgid "Clear" msgstr "" @@ -659,6 +662,11 @@ msgstr "" msgid "Select All" msgstr "" +#: ../html/src/components/table/SelectSearchField.tsx:5 +#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 +msgid "All" +msgstr "" + #: ../html/src/components/table/TableDataHandler.tsx:409 msgid "items per page" msgstr "" @@ -679,8 +687,8 @@ msgstr "" #: ../html/src/manager/minion/ansible/ansible-path-content.tsx:70 #: ../html/src/manager/minion/ptf/ptf-overview.renderer.tsx:56 #: ../html/src/manager/systems/activation-key/activation-key-channels.tsx:99 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:632 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:633 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:634 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:635 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:323 #: ../html/src/manager/virtualization/guests/edit/guests-edit.tsx:95 #: ../html/src/manager/virtualization/nets/network-properties.tsx:464 @@ -804,8 +812,8 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/templates/live-patching.tsx:121 #: ../html/src/manager/maintenance/details/schedule-details.tsx:203 #: ../html/src/manager/minion/packages/package-states.tsx:224 -#: ../html/src/manager/systems/all-list.tsx:21 -#: ../html/src/manager/systems/all-list.tsx:76 +#: ../html/src/manager/systems/all-list.tsx:62 +#: ../html/src/manager/systems/list-filter.tsx:41 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:81 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:770 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:127 @@ -866,29 +874,29 @@ msgstr "" msgid " to learn how to consume these metrics." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:256 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:276 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:296 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:318 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:258 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:278 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:298 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:320 msgid "Enable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:263 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:283 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:303 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:326 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:265 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:285 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:305 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:328 msgid "Disable" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:339 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:341 msgid "SUSE Manager Configuration - Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:344 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:346 msgid "Setup your SUSE Manager server monitoring." msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:350 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:352 #: ../html/src/manager/virtualization/guests/GuestProperties.tsx:125 #: ../html/src/manager/virtualization/guests/properties/guest-properties-traditional.tsx:53 #: ../html/src/manager/virtualization/nets/network-properties.tsx:219 @@ -896,38 +904,38 @@ msgstr "" msgid "General" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:355 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:357 msgid "Bootstrap Script" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:360 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:362 msgid "Organizations" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:365 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:367 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:50 msgid "Restart" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:370 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:372 msgid "Cobbler" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:375 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:377 msgid "Bare-metal systems" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:379 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:385 -#: ../html/src/manager/admin/config/monitoring-admin.tsx:396 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:381 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:387 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:398 msgid "Monitoring" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:407 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:409 msgid "Restarting" msgstr "" -#: ../html/src/manager/admin/config/monitoring-admin.tsx:408 +#: ../html/src/manager/admin/config/monitoring-admin.tsx:410 msgid "" " Tomcat and Taskomatic is needed for the configuration changes to take " "effect." @@ -973,7 +981,7 @@ msgid "Bastion SSH connection data" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:84 -#: ../html/src/manager/admin/setup/products/products.tsx:294 +#: ../html/src/manager/admin/setup/products/products.tsx:296 msgid "Setup Wizard" msgstr "" @@ -1011,8 +1019,8 @@ msgid "never" msgstr "" #: ../html/src/manager/admin/list-payg/list-payg.tsx:166 -#: ../html/src/manager/admin/setup/products/products.tsx:447 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:866 +#: ../html/src/manager/admin/setup/products/products.tsx:449 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:868 msgid "of" msgstr "" @@ -1117,35 +1125,35 @@ msgstr "" msgid "Are you sure you want to delete project" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:146 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:148 msgid "Refresh the product catalog from SUSE Customer Center" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:178 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:180 #: ../html/src/manager/images/image-profiles.tsx:151 #: ../html/src/manager/images/image-stores.tsx:151 -#: ../html/src/manager/images/image-view.tsx:373 +#: ../html/src/manager/images/image-view.tsx:375 #: ../html/src/manager/notifications/notification-messages.tsx:451 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:242 msgid "Refresh" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:181 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:183 msgid "Please be patient, this might take several minutes." msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:186 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:188 #: ../html/src/manager/images/image-view-overview.tsx:141 msgid "Completed" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:191 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:193 msgid "Operation not successful: Empty reply from the server" msgstr "" -#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:192 +#: ../html/src/manager/admin/setup/products/products-scc-dialog.tsx:194 #: ../html/src/manager/images/image-view-patches.tsx:87 -#: ../html/src/manager/images/image-view.tsx:687 +#: ../html/src/manager/images/image-view.tsx:689 #: ../html/src/manager/maintenance/list/calendar-list.tsx:69 #: ../html/src/manager/maintenance/list/schedule-list.tsx:54 #: ../html/src/manager/recurring/recurring-actions-list.tsx:207 @@ -1178,65 +1186,65 @@ msgid "" "files." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:319 +#: ../html/src/manager/admin/setup/products/products.tsx:321 msgid "" "A refresh of the product data is currently running in the background. Please " "try again later." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:324 +#: ../html/src/manager/admin/setup/products/products.tsx:326 msgid "The product catalog is still refreshing, please wait." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:326 +#: ../html/src/manager/admin/setup/products/products.tsx:328 msgid "Select some product first." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:335 -#: ../html/src/manager/admin/setup/products/products.tsx:343 +#: ../html/src/manager/admin/setup/products/products.tsx:337 +#: ../html/src/manager/admin/setup/products/products.tsx:345 msgid "Add products" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:362 +#: ../html/src/manager/admin/setup/products/products.tsx:364 msgid "Clear products selection" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:403 +#: ../html/src/manager/admin/setup/products/products.tsx:405 msgid "Why aren't all products displayed in the list?" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:406 +#: ../html/src/manager/admin/setup/products/products.tsx:408 msgid "" "The products displayed on this list are directly linked to your Organization " "credentials (Mirror credentials) as well as your SUSE subscriptions." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:411 +#: ../html/src/manager/admin/setup/products/products.tsx:413 msgid "" "If you believe there are products missing, make sure you have added the " "correct Organization credentials in the previous wizard step." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:421 +#: ../html/src/manager/admin/setup/products/products.tsx:423 msgid "" "This server is configured as an Inter-Server Synchronisation (ISS) slave. " "Products can only be managed on the ISS master." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:498 +#: ../html/src/manager/admin/setup/products/products.tsx:500 msgid "Filter by architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:593 +#: ../html/src/manager/admin/setup/products/products.tsx:595 msgid "Filter by product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:669 +#: ../html/src/manager/admin/setup/products/products.tsx:671 msgid "Product Description" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:675 -#: ../html/src/manager/admin/setup/products/products.tsx:1053 +#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:1055 #: ../html/src/manager/content-management/list-filters/filter-form.tsx:156 #: ../html/src/manager/images/image-view-packages.tsx:50 #: ../html/src/manager/minion/ptf/ptf-column-definition.tsx:32 @@ -1244,104 +1252,104 @@ msgstr "" msgid "Architecture" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:677 +#: ../html/src/manager/admin/setup/products/products.tsx:679 msgid "Arch" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:684 +#: ../html/src/manager/admin/setup/products/products.tsx:686 #: ../html/src/manager/packages/list.tsx:158 msgid "Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:855 +#: ../html/src/manager/admin/setup/products/products.tsx:857 msgid " channels sync failed" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:863 +#: ../html/src/manager/admin/setup/products/products.tsx:865 msgid " channels sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:871 +#: ../html/src/manager/admin/setup/products/products.tsx:873 msgid " channels synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:896 +#: ../html/src/manager/admin/setup/products/products.tsx:898 msgid "To enable this product, the parent product should be selected first" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:897 +#: ../html/src/manager/admin/setup/products/products.tsx:899 msgid "Select this product" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:909 +#: ../html/src/manager/admin/setup/products/products.tsx:911 msgid "This product is mirrored." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:938 +#: ../html/src/manager/admin/setup/products/products.tsx:940 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:71 #: ../html/src/manager/systems/activation-key/child-channels.tsx:144 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:492 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:545 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:547 msgid "recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:956 +#: ../html/src/manager/admin/setup/products/products.tsx:958 #: ../html/src/manager/content-management/shared/components/panels/sources/channels/recommended-toggle.tsx:28 #: ../html/src/manager/systems/activation-key/child-channels.tsx:173 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:429 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:592 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:594 msgid "include recommended" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:998 +#: ../html/src/manager/admin/setup/products/products.tsx:1000 msgid "SCC product catalog refresh in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1001 +#: ../html/src/manager/admin/setup/products/products.tsx:1003 msgid "Scheduling channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1004 +#: ../html/src/manager/admin/setup/products/products.tsx:1006 msgid "Channels product resync scheduled" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1007 +#: ../html/src/manager/admin/setup/products/products.tsx:1009 msgid "Schedule channels product resync" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1067 +#: ../html/src/manager/admin/setup/products/products.tsx:1069 msgid "Show product's channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1133 +#: ../html/src/manager/admin/setup/products/products.tsx:1135 msgid "Product Channels - " msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1138 +#: ../html/src/manager/admin/setup/products/products.tsx:1140 msgid "Select the optional channels you wish to add and confirm." msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1142 +#: ../html/src/manager/admin/setup/products/products.tsx:1144 msgid "Mandatory Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1144 +#: ../html/src/manager/admin/setup/products/products.tsx:1146 msgid "Optional Channels" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1180 +#: ../html/src/manager/admin/setup/products/products.tsx:1182 msgid "not synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1183 +#: ../html/src/manager/admin/setup/products/products.tsx:1185 msgid "sync in progress" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1186 +#: ../html/src/manager/admin/setup/products/products.tsx:1188 msgid "synced" msgstr "" -#: ../html/src/manager/admin/setup/products/products.tsx:1189 +#: ../html/src/manager/admin/setup/products/products.tsx:1191 msgid "sync failed" msgstr "" @@ -1498,7 +1506,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-form.tsx:28 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-form.tsx:23 #: ../html/src/manager/content-management/shared/components/panels/properties/properties-view.tsx:44 -#: ../html/src/manager/images/image-view.tsx:641 +#: ../html/src/manager/images/image-view.tsx:643 #: ../html/src/manager/salt/keys/key-management.tsx:160 #: ../html/src/manager/systems/details/mgr-server-info.tsx:83 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:78 @@ -1515,7 +1523,7 @@ msgstr "" #: ../html/src/manager/audit/cveaudit/cveaudit.tsx:334 #: ../html/src/manager/images/image-profiles.tsx:190 #: ../html/src/manager/images/image-stores.tsx:192 -#: ../html/src/manager/images/image-view.tsx:681 +#: ../html/src/manager/images/image-view.tsx:683 #: ../html/src/manager/maintenance/list/calendar-list.tsx:64 #: ../html/src/manager/maintenance/list/schedule-list.tsx:49 #: ../html/src/manager/recurring/recurring-actions-list.tsx:202 @@ -2002,7 +2010,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/promote/promote.tsx:80 #: ../html/src/manager/content-management/shared/components/panels/properties/properties.utils.ts:4 #: ../html/src/manager/images/image-build.tsx:374 -#: ../html/src/manager/images/image-view.tsx:642 +#: ../html/src/manager/images/image-view.tsx:644 #: ../html/src/manager/systems/details/mgr-server-info.tsx:87 msgid "Version" msgstr "" @@ -2091,7 +2099,7 @@ msgstr "" #: ../html/src/manager/content-management/list-filters/list-filters.tsx:144 #: ../html/src/manager/images/image-profiles.tsx:137 #: ../html/src/manager/images/image-stores.tsx:137 -#: ../html/src/manager/images/image-view.tsx:350 +#: ../html/src/manager/images/image-view.tsx:352 msgid "Delete selected" msgstr "" @@ -2337,12 +2345,6 @@ msgstr "" msgid "Contains Package" msgstr "" -#. Value options for filtering by Target Type in recurring actions list -#: ../html/src/manager/content-management/shared/business/filters.enum.ts:222 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:10 -msgid "All" -msgstr "" - #: ../html/src/manager/content-management/shared/business/filters.enum.ts:240 msgid "Fixes Package Name" msgstr "" @@ -2365,7 +2367,7 @@ msgstr "" #: ../html/src/manager/images/image-profiles.tsx:198 #: ../html/src/manager/images/image-view-overview.tsx:626 #: ../html/src/manager/images/image-view-overview.tsx:725 -#: ../html/src/manager/images/image-view.tsx:669 +#: ../html/src/manager/images/image-view.tsx:671 msgid "Build" msgstr "" @@ -2456,13 +2458,13 @@ msgid "Waiting for repositories data to be generated" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:30 -#: ../html/src/manager/images/image-view.tsx:505 +#: ../html/src/manager/images/image-view.tsx:507 msgid "Built" msgstr "" #: ../html/src/manager/content-management/shared/components/panels/environment-lifecycle/environment-view.tsx:31 #: ../html/src/manager/images/image-view-overview.tsx:81 -#: ../html/src/manager/images/image-view.tsx:507 +#: ../html/src/manager/images/image-view.tsx:509 msgid "Failed" msgstr "" @@ -2596,7 +2598,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/channels-selection.tsx:196 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:541 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:603 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:605 msgid "Child Channels" msgstr "" @@ -2622,7 +2624,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/channels/child-channel.tsx:76 #: ../html/src/manager/systems/activation-key/child-channels.tsx:149 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:550 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:552 msgid "mandatory" msgstr "" @@ -2634,7 +2636,7 @@ msgstr "" #: ../html/src/manager/content-management/shared/components/panels/sources/sources.tsx:37 #: ../html/src/manager/images/image-stores.tsx:184 #: ../html/src/manager/images/image-view-patches.tsx:79 -#: ../html/src/manager/images/image-view.tsx:640 +#: ../html/src/manager/images/image-view.tsx:642 #: ../html/src/manager/maintenance/edit/schedule-edit.tsx:105 #: ../html/src/manager/notifications/notification-messages.tsx:513 #: ../html/src/manager/state/highstate-summary.tsx:73 @@ -2697,40 +2699,25 @@ msgid "" "this group" msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:16 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:15 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:15 msgid "" "Formula saved. Edit configuration options in the enabled formulas and apply " -"the " -msgstr "" - -#. Value options for filtering by Action Type in recurring actions list -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:17 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:17 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:17 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:17 -#: ../html/src/manager/state/highstate.tsx:142 -msgid "Highstate" -msgstr "" - -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:18 -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:18 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:18 -msgid " for the changes to take effect." +"the Highstate for the changes to take effect." msgstr "" -#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:21 +#: ../html/src/manager/groups/formula/group-formula-selection.renderer.tsx:24 #: ../html/src/manager/groups/formula/group-formula.renderer.tsx:21 -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:21 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:24 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:21 msgid "Invalid target type." msgstr "" -#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:16 -#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:16 -msgid "Formula saved. Apply the " +#: ../html/src/manager/groups/formula/group-formula.renderer.tsx:14 +#: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:14 +msgid "" +"Formula saved. Apply the Highstate for the changes to take " +"effect." msgstr "" #: ../html/src/manager/header/search/search.tsx:10 @@ -2739,18 +2726,18 @@ msgid "Systems" msgstr "" #: ../html/src/manager/header/search/search.tsx:14 -#: ../html/src/manager/images/image-view.tsx:665 -#: ../html/src/manager/images/image-view.tsx:789 -#: ../html/src/manager/systems/all-list.tsx:25 -#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/images/image-view.tsx:667 +#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/systems/all-list.tsx:92 +#: ../html/src/manager/systems/list-filter.tsx:45 msgid "Packages" msgstr "" #: ../html/src/manager/header/search/search.tsx:18 -#: ../html/src/manager/images/image-view.tsx:652 -#: ../html/src/manager/images/image-view.tsx:788 -#: ../html/src/manager/systems/all-list.tsx:24 -#: ../html/src/manager/systems/all-list.tsx:93 +#: ../html/src/manager/images/image-view.tsx:654 +#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/systems/all-list.tsx:79 +#: ../html/src/manager/systems/list-filter.tsx:44 msgid "Patches" msgstr "" @@ -2774,8 +2761,8 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-build.tsx:205 -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1039 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:373 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1043 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:375 msgid "Action has been successfully added to the Action Chain " msgstr "" @@ -2789,7 +2776,7 @@ msgstr "" #: ../html/src/manager/minion/packages/use-package-states.api.tsx:51 #: ../html/src/manager/systems/proxy.tsx:70 #: ../html/src/manager/systems/proxy.tsx:74 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:382 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:384 msgid "scheduled" msgstr "" @@ -2807,7 +2794,7 @@ msgid "Image Type" msgstr "" #: ../html/src/manager/images/image-build.tsx:266 -#: ../html/src/manager/images/image-import.tsx:254 +#: ../html/src/manager/images/image-import.tsx:256 msgid "Image Store" msgstr "" @@ -2817,7 +2804,7 @@ msgid "Path" msgstr "" #: ../html/src/manager/images/image-build.tsx:274 -#: ../html/src/manager/images/image-import.tsx:229 +#: ../html/src/manager/images/image-import.tsx:231 #: ../html/src/manager/images/image-profile-edit.tsx:394 #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:553 msgid "Activation Key" @@ -2832,7 +2819,7 @@ msgid "Image Profile" msgstr "" #: ../html/src/manager/images/image-build.tsx:380 -#: ../html/src/manager/images/image-import.tsx:289 +#: ../html/src/manager/images/image-import.tsx:291 msgid "Build Host" msgstr "" @@ -2844,41 +2831,41 @@ msgstr "" msgid "The image import has been scheduled." msgstr "" -#: ../html/src/manager/images/image-import.tsx:222 +#: ../html/src/manager/images/image-import.tsx:224 #: ../html/src/manager/images/image-profile-edit.tsx:386 msgid "There are no channels assigned to this key." msgstr "" -#: ../html/src/manager/images/image-import.tsx:242 +#: ../html/src/manager/images/image-import.tsx:244 msgid "Import Image" msgstr "" -#: ../html/src/manager/images/image-import.tsx:244 +#: ../html/src/manager/images/image-import.tsx:246 msgid "You can import Container images only using this feature." msgstr "" -#: ../html/src/manager/images/image-import.tsx:270 +#: ../html/src/manager/images/image-import.tsx:272 msgid "Image name" msgstr "" -#: ../html/src/manager/images/image-import.tsx:272 +#: ../html/src/manager/images/image-import.tsx:274 msgid "Image name is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:279 +#: ../html/src/manager/images/image-import.tsx:281 msgid "Image version" msgstr "" -#: ../html/src/manager/images/image-import.tsx:281 +#: ../html/src/manager/images/image-import.tsx:283 msgid "Image version is required." msgstr "" -#: ../html/src/manager/images/image-import.tsx:305 -#: ../html/src/manager/images/image-view.tsx:368 +#: ../html/src/manager/images/image-import.tsx:307 +#: ../html/src/manager/images/image-view.tsx:370 msgid "Import" msgstr "" -#: ../html/src/manager/images/image-import.tsx:312 +#: ../html/src/manager/images/image-import.tsx:314 #: ../html/src/manager/images/image-profile-edit.tsx:481 #: ../html/src/manager/images/image-store-edit.tsx:202 #: ../html/src/manager/proxy/container-config.tsx:386 @@ -3063,7 +3050,7 @@ msgid "" msgstr "" #: ../html/src/manager/images/image-view-buildlog.tsx:5 -#: ../html/src/manager/images/image-view.tsx:790 +#: ../html/src/manager/images/image-view.tsx:792 msgid "Build Log" msgstr "" @@ -3081,13 +3068,13 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:514 #: ../html/src/manager/images/image-view-runtime.tsx:69 #: ../html/src/manager/images/image-view-runtime.tsx:106 -#: ../html/src/manager/images/image-view.tsx:480 -#: ../html/src/manager/images/image-view.tsx:529 +#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:531 msgid "No information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:45 -#: ../html/src/manager/images/image-view.tsx:501 +#: ../html/src/manager/images/image-view.tsx:503 msgid "Queued" msgstr "" @@ -3124,7 +3111,7 @@ msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:105 #: ../html/src/manager/images/image-view-overview.tsx:106 -#: ../html/src/manager/images/image-view.tsx:499 +#: ../html/src/manager/images/image-view.tsx:501 msgid "Built externally" msgstr "" @@ -3137,37 +3124,37 @@ msgid "Picked Up" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:186 -#: ../html/src/manager/images/image-view.tsx:555 +#: ../html/src/manager/images/image-view.tsx:557 msgid "Cluster" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:187 -#: ../html/src/manager/images/image-view.tsx:556 -#: ../html/src/manager/images/image-view.tsx:608 +#: ../html/src/manager/images/image-view.tsx:558 +#: ../html/src/manager/images/image-view.tsx:610 msgid "Instances" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:197 #: ../html/src/manager/images/image-view-overview.tsx:234 -#: ../html/src/manager/images/image-view.tsx:517 -#: ../html/src/manager/images/image-view.tsx:566 +#: ../html/src/manager/images/image-view.tsx:519 +#: ../html/src/manager/images/image-view.tsx:568 msgid "Waiting for update ..." msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:214 -#: ../html/src/manager/images/image-view.tsx:583 +#: ../html/src/manager/images/image-view.tsx:585 msgid "View cluster summary" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:245 #: ../html/src/manager/images/image-view-overview.tsx:247 -#: ../html/src/manager/images/image-view.tsx:525 +#: ../html/src/manager/images/image-view.tsx:527 msgid "All instances are consistent with SUSE Manager" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:260 #: ../html/src/manager/images/image-view-overview.tsx:261 -#: ../html/src/manager/images/image-view.tsx:531 +#: ../html/src/manager/images/image-view.tsx:533 msgid "Outdated instances found" msgstr "" @@ -3180,31 +3167,32 @@ msgid "Edit store" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:465 -#: ../html/src/manager/images/image-view.tsx:748 +#: ../html/src/manager/images/image-view.tsx:750 msgid "Instance Details for '{name}'" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:520 #: ../html/src/manager/images/image-view-overview.tsx:521 -#: ../html/src/manager/images/image-view.tsx:482 +#: ../html/src/manager/images/image-view.tsx:484 +#: ../html/src/manager/systems/list-filter.tsx:26 msgid "Critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:527 #: ../html/src/manager/images/image-view-overview.tsx:528 -#: ../html/src/manager/images/image-view.tsx:485 +#: ../html/src/manager/images/image-view.tsx:487 msgid "Non-critical updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:534 #: ../html/src/manager/images/image-view-overview.tsx:535 -#: ../html/src/manager/images/image-view.tsx:488 +#: ../html/src/manager/images/image-view.tsx:490 msgid "Package updates available" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:541 #: ../html/src/manager/images/image-view-overview.tsx:542 -#: ../html/src/manager/images/image-view.tsx:490 +#: ../html/src/manager/images/image-view.tsx:492 msgid "Image is up to date" msgstr "" @@ -3242,13 +3230,13 @@ msgid "Custom Image Information" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:678 -#: ../html/src/manager/images/image-view.tsx:360 -#: ../html/src/manager/images/image-view.tsx:718 +#: ../html/src/manager/images/image-view.tsx:362 +#: ../html/src/manager/images/image-view.tsx:720 msgid "Delete Image" msgstr "" #: ../html/src/manager/images/image-view-overview.tsx:681 -#: ../html/src/manager/images/image-view.tsx:721 +#: ../html/src/manager/images/image-view.tsx:723 msgid "Are you sure you want to delete image" msgstr "" @@ -3350,75 +3338,75 @@ msgstr "" msgid "Namespace" msgstr "" -#: ../html/src/manager/images/image-view.tsx:307 +#: ../html/src/manager/images/image-view.tsx:309 msgid "Deleted successfully." msgstr "" -#: ../html/src/manager/images/image-view.tsx:319 +#: ../html/src/manager/images/image-view.tsx:321 msgid "Image inspect has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:335 +#: ../html/src/manager/images/image-view.tsx:337 msgid "Image build has been scheduled." msgstr "" -#: ../html/src/manager/images/image-view.tsx:383 +#: ../html/src/manager/images/image-view.tsx:385 msgid "Images" msgstr "" -#: ../html/src/manager/images/image-view.tsx:503 +#: ../html/src/manager/images/image-view.tsx:505 msgid "Building" msgstr "" -#: ../html/src/manager/images/image-view.tsx:509 +#: ../html/src/manager/images/image-view.tsx:511 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:232 #: ../html/src/manager/virtualization/pools/list/pools-list.tsx:300 msgid "Unknown" msgstr "" -#: ../html/src/manager/images/image-view.tsx:603 -#: ../html/src/manager/images/image-view.tsx:791 +#: ../html/src/manager/images/image-view.tsx:605 +#: ../html/src/manager/images/image-view.tsx:793 msgid "Runtime" msgstr "" -#: ../html/src/manager/images/image-view.tsx:623 +#: ../html/src/manager/images/image-view.tsx:625 msgid "Show obsolete" msgstr "" -#: ../html/src/manager/images/image-view.tsx:645 +#: ../html/src/manager/images/image-view.tsx:647 msgid "Revision" msgstr "" -#: ../html/src/manager/images/image-view.tsx:647 +#: ../html/src/manager/images/image-view.tsx:649 msgid "(obsolete)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:649 -#: ../html/src/manager/systems/all-list.tsx:23 -#: ../html/src/manager/systems/all-list.tsx:82 +#: ../html/src/manager/images/image-view.tsx:651 +#: ../html/src/manager/systems/all-list.tsx:68 +#: ../html/src/manager/systems/list-filter.tsx:43 #: ../html/src/manager/systems/virtual-list.tsx:90 #: ../html/src/manager/virtualization/guests/list/guests-list.tsx:143 msgid "Updates" msgstr "" -#: ../html/src/manager/images/image-view.tsx:673 +#: ../html/src/manager/images/image-view.tsx:675 msgid "Last Modified" msgstr "" -#: ../html/src/manager/images/image-view.tsx:734 +#: ../html/src/manager/images/image-view.tsx:736 msgid "Delete Selected Image(s)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:738 +#: ../html/src/manager/images/image-view.tsx:740 msgid "Are you sure you want to delete the selected image?" msgstr "" -#: ../html/src/manager/images/image-view.tsx:739 +#: ../html/src/manager/images/image-view.tsx:741 msgid "" "Are you sure you want to delete selected images? ({count} images selected)" msgstr "" -#: ../html/src/manager/images/image-view.tsx:787 +#: ../html/src/manager/images/image-view.tsx:789 #: ../html/src/manager/maintenance/details/schedule-details.tsx:55 msgid "Overview" msgstr "" @@ -3928,7 +3916,7 @@ msgstr "" msgid "Applying the config channels has been " msgstr "" -#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:62 +#: ../html/src/manager/minion/formula/minion-formula-selection.renderer.tsx:65 #: ../html/src/manager/minion/formula/minion-formula.renderer.tsx:32 msgid "Configuration" msgstr "" @@ -4382,9 +4370,10 @@ msgstr "" msgid "City" msgstr "" +#. Value options for filtering by Target Type in recurring actions list #: ../html/src/manager/proxy/container-config.tsx:320 #: ../html/src/manager/recurring/recurring-actions-utils.tsx:8 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:11 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:2 #: ../html/src/manager/state/highstate-summary.tsx:169 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-details.tsx:181 #: ../html/src/manager/systems/virtualhostmanager/virtualhostmanager-list.tsx:63 @@ -4513,7 +4502,7 @@ msgstr "" #: ../html/src/manager/recurring/recurring-actions-edit.tsx:219 #: ../html/src/manager/recurring/recurring-actions-list.tsx:196 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:5 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:16 msgid "Action Type" msgstr "" @@ -4540,22 +4529,22 @@ msgid "Frequency" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:180 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:15 msgid "Target Type" msgstr "" #: ../html/src/manager/recurring/recurring-actions-list.tsx:188 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:14 msgid "Target Name" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:4 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:13 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:4 msgid "Minion" msgstr "" #: ../html/src/manager/recurring/recurring-actions-utils.tsx:6 -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:12 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:3 msgid "Group" msgstr "" @@ -4569,15 +4558,13 @@ msgid "" "scheduled time will be the server time." msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-action-type-filter.tsx:16 -msgid "Select an Action Type" -msgstr "" - -#: ../html/src/manager/recurring/search/recurring-actions-search-target-type-filter.tsx:18 -msgid "Select a Target Type" +#. Value options for filtering by Action Type in recurring actions list +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:8 +#: ../html/src/manager/state/highstate.tsx:142 +msgid "Highstate" msgstr "" -#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:18 +#: ../html/src/manager/recurring/search/recurring-actions-search-utils.tsx:9 msgid "Custom State" msgstr "" @@ -4833,52 +4820,36 @@ msgid "" "selected child channels." msgstr "" -#: ../html/src/manager/systems/all-list.tsx:22 -msgid "System Kind" +#: ../html/src/manager/systems/all-list.tsx:37 +msgid " Systems " msgstr "" -#: ../html/src/manager/systems/all-list.tsx:26 -#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/all-list.tsx:57 +msgid "No Systems." +msgstr "" + +#: ../html/src/manager/systems/all-list.tsx:106 +#: ../html/src/manager/systems/list-filter.tsx:46 msgid "Extra Packages" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:27 -#: ../html/src/manager/systems/all-list.tsx:134 +#: ../html/src/manager/systems/all-list.tsx:120 +#: ../html/src/manager/systems/list-filter.tsx:47 msgid "Config Diffs" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:28 -#: ../html/src/manager/systems/all-list.tsx:149 +#: ../html/src/manager/systems/all-list.tsx:135 +#: ../html/src/manager/systems/list-filter.tsx:48 #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:146 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:577 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:579 msgid "Base Channel" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:29 -#: ../html/src/manager/systems/all-list.tsx:160 +#: ../html/src/manager/systems/all-list.tsx:146 +#: ../html/src/manager/systems/list-filter.tsx:49 msgid "System Type" msgstr "" -#: ../html/src/manager/systems/all-list.tsx:30 -msgid "Requires Reboot" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:31 -msgid "Registered Days" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:32 -msgid "Groups" -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:51 -msgid " Systems " -msgstr "" - -#: ../html/src/manager/systems/all-list.tsx:71 -msgid "No Systems." -msgstr "" - #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:40 msgid "Error Details" msgstr "" @@ -4918,6 +4889,7 @@ msgid "Loading SSH Private Key.." msgstr "" #: ../html/src/manager/systems/bootstrap/bootstrap-minions.tsx:377 +#: ../html/src/manager/systems/list-filter.tsx:13 msgid "Bootstrap" msgstr "" @@ -5007,12 +4979,12 @@ msgstr "" msgid "No result found in state apply response." msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:70 -#: ../html/src/manager/systems/delete-system.tsx:71 +#: ../html/src/manager/systems/delete-system.tsx:72 +#: ../html/src/manager/systems/delete-system.tsx:73 msgid "Delete Profile Without Cleanup" msgstr "" -#: ../html/src/manager/systems/delete-system.tsx:91 +#: ../html/src/manager/systems/delete-system.tsx:93 msgid "An error occurred during cleanup" msgstr "" @@ -5057,6 +5029,104 @@ msgstr "" msgid "Confirm Deletion" msgstr "" +#: ../html/src/manager/systems/list-filter.tsx:4 +msgid "Manager Server" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:5 +msgid "Physical" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:12 +msgid "Ansible Control Node" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:14 +msgid "Container Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:15 +msgid "Foreign" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:16 +msgid "Management" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:17 +msgid "Monitored Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:18 +msgid "OS Image Build Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:19 +msgid "Salt" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:20 +msgid "Virtualization Host" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:24 +msgid "Actions scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:25 +msgid "All updates scheduled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:27 +msgid "Kickstart in progress" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:28 +msgid "System is up to date" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:29 +msgid "System not checking in" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:30 +msgid "System not entitled" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:31 +msgid "System requires reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:32 +msgid "Updates available" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:36 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 +msgid "Yes" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:37 +#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 +msgid "No" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:42 +msgid "System Kind" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:50 +msgid "Requires Reboot" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:51 +msgid "Registered Days" +msgstr "" + +#: ../html/src/manager/systems/list-filter.tsx:52 +msgid "Groups" +msgstr "" + #: ../html/src/manager/systems/proxy.tsx:44 msgid "Please select a list of minions (not proxies or traditional clients)." msgstr "" @@ -5153,12 +5223,12 @@ msgid "Desired base Channel" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:219 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:463 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:465 msgid "SUSE Channels" msgstr "" #: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:224 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:489 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:491 msgid "Custom Channels" msgstr "" @@ -5240,49 +5310,49 @@ msgstr "" msgid "Scheduled" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:792 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:794 msgid "Unknown error. Could not schedule channel change" msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:913 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:917 msgid "Some changes scheduled successfully." msgstr "" -#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1046 +#: ../html/src/manager/systems/ssm/ssm-subscribe-channels.tsx:1050 msgid "Channel changes scheduled." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:238 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:452 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:240 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:454 msgid "(none, disable service)" msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:381 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:383 msgid "Changing the channels has been " msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:582 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:584 msgid "" "You can change the base software channel your system is subscribed to. The " "system will be unsubscribed from all software channels, and subscribed to " "the new base software channel." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:608 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:610 msgid "" "This system is subscribed to the checked channels beneath, if any. Disabled " "checkboxes indicate channels that can't be manually subscribed or " "unsubscribed from." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:627 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:628 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:706 -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:707 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:629 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:630 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:708 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:709 msgid "No child channels available." msgstr "" -#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:660 +#: ../html/src/manager/systems/subscribe-channels/subscribe-channels.tsx:662 msgid "Confirm Software Channel Change" msgstr "" @@ -6111,14 +6181,6 @@ msgstr "" msgid "Partition separator" msgstr "" -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:187 -msgid "Yes" -msgstr "" - -#: ../html/src/manager/virtualization/pools/pool-properties.tsx:188 -msgid "No" -msgstr "" - #: ../html/src/manager/virtualization/pools/pool-properties.tsx:213 msgid "Host name" msgstr "" From d4b89e9f918fa5c447bd4d61aa58ec2f4799c26a Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Thu, 3 Aug 2023 18:01:10 +0200 Subject: [PATCH 030/127] Move updated script as it was created after tag 4.4.6 --- .../100-update-recurring-action.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename schema/spacewalk/upgrade/{susemanager-schema-4.4.5-to-susemanager-schema-4.4.6 => susemanager-schema-4.4.6-to-susemanager-schema-4.4.7}/100-update-recurring-action.sql (100%) diff --git a/schema/spacewalk/upgrade/susemanager-schema-4.4.5-to-susemanager-schema-4.4.6/100-update-recurring-action.sql b/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/100-update-recurring-action.sql similarity index 100% rename from schema/spacewalk/upgrade/susemanager-schema-4.4.5-to-susemanager-schema-4.4.6/100-update-recurring-action.sql rename to schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/100-update-recurring-action.sql From cf174c64ed61d330e00f27b682c0536d93a91ea7 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Fri, 4 Aug 2023 15:17:40 +0200 Subject: [PATCH 031/127] Update both main and reportdb databases, using only upgrade script for the new version --- testsuite/podman_runner/07_manager_setup.sh | 17 +++++++++-- testsuite/podman_runner/run_db_migrations.sh | 31 +++++++++++++++++--- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/testsuite/podman_runner/07_manager_setup.sh b/testsuite/podman_runner/07_manager_setup.sh index ec7e20cdb345..74fe4ff88fac 100755 --- a/testsuite/podman_runner/07_manager_setup.sh +++ b/testsuite/podman_runner/07_manager_setup.sh @@ -1,6 +1,19 @@ #!/bin/bash set -xe + +src_dir=$(cd $(dirname "$0")/../.. && pwd -P) + sudo -i podman exec uyuni-server-all-in-one-test bash -c "/usr/lib/susemanager/bin/mgr-setup -l /var/log/susemanager_setup.log -s" sudo -i podman exec uyuni-server-all-in-one-test bash -c "/usr/bin/spacewalk-schema-upgrade -y" -# Make sure latest sql migration scripts have been executed -sudo -i podman exec uyuni-server-all-in-one-test bash -c "/testsuite/podman_runner/run_db_migrations.sh" + +# Make sure latest sql migration scripts have been executed for both the main and the reporting database +available_schemas=("spacewalk" "reportdb") +for schema in ${available_schemas[@]}; do + specfile=$(find ${src_dir}/schema/${schema}/ -name *.spec) + # Use Perl extended regexp and look-around assertions to extract only the values from the spec properties + schema_name=$(grep -oP "Name:\s+\K(.*)$" ${specfile}) + schema_version=$(grep -oP "Version:\s+\K(.*)$" ${specfile}) + + sudo -i podman exec uyuni-server-all-in-one-test bash -c "/testsuite/podman_runner/run_db_migrations.sh ${schema_name} ${schema_version}" +done + diff --git a/testsuite/podman_runner/run_db_migrations.sh b/testsuite/podman_runner/run_db_migrations.sh index 36b1290447aa..1b36fa2eef59 100755 --- a/testsuite/podman_runner/run_db_migrations.sh +++ b/testsuite/podman_runner/run_db_migrations.sh @@ -1,7 +1,30 @@ #!/bin/bash -e -for i in $(ls /etc/sysconfig/rhn/schema-upgrade/ | tail -n1);do - for j in $(ls /etc/sysconfig/rhn/schema-upgrade/$i);do - echo $i;spacewalk-sql /etc/sysconfig/rhn/schema-upgrade/$i/$j; + +if [ $# -ne 2 ]; +then + echo "Usage: $0 " + echo "where" + echo " schema_name name of the schema to update (susemanager-schema or uyuni-reportdb-schema)" + echo " schema_version version of the schema currently installed" + exit 1 +fi + +if [[ "$1" == "susemanager-schema" ]]; +then + upgrade_dir="/etc/sysconfig/rhn/schema-upgrade/" + additional_params="" +elif [[ "$1" == "uyuni-reportdb-schema" ]]; +then + upgrade_dir="/etc/sysconfig/rhn/reportdb-schema-upgrade/" + additional_params="--reportdb" +else + echo "Unknown schema $1. Use either susemanager-schema or uyuni-reportdb-schema." + exit 1 +fi + +for i in $(find ${upgrade_dir} -name "$1-$2-to-*"); do + echo $(basename $i) + for j in $(find $i -name *.sql); do + echo -e "\t$(basename $j)"; spacewalk-sql ${additional_params} $j | sed 's/^/\t\t/'; done; done - From 343c8bfb3cac5371149aea3b2699b20affa96d72 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Mon, 7 Aug 2023 11:34:16 +0200 Subject: [PATCH 032/127] Extend success message after enabling monitoring (#7348) * Extend success message after enabling monitoring The message hinting the user to open the required ports and pointing to the documentation was added. Signed-off-by: Witek Bedyk --- .../action/systems/sdc/SystemDetailsEditAction.java | 5 +++-- .../rhn/frontend/strings/java/StringResource_en_US.xml | 2 +- .../suse/manager/webui/utils/UserPreferenceUtils.java | 10 ++++++++++ ...pacewalk-java.changes.witek.update_monitoring_added | 1 + 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 java/spacewalk-java.changes.witek.update_monitoring_added diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java index 144424e0c43e..22f9260fdefb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java @@ -296,9 +296,10 @@ private boolean applyAddonEntitlementChanges(HttpServletRequest request, log.debug("adding entitlement success msg"); if (ConfigDefaults.get().isDocAvailable()) { - createSuccessMessage(request, + createMessage(request, "system.entitle.added." + e.getLabel(), - s.getId().toString()); + s.getId().toString(), + GlobalInstanceHolder.USER_PREFERENCE_UTILS.getDocsLocale(user)); } else { createSuccessMessage(request, diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index cf6859a213dc..7d3c257f3c4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -9061,7 +9061,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte - <strong>Monitoring</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters. + <strong>Monitoring</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters.<br/><strong>Note:</strong> Please make sure to open the <a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports">required network ports</a> for all installed exporters. /rhn/systems/details/Overview.do diff --git a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java index 7dc6c7cc852e..ca70e47c817a 100644 --- a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java +++ b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java @@ -104,6 +104,16 @@ public String getDocsLocale(PageContext pageContext) { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); User user = new RequestContext(request).getCurrentUser(); + return getDocsLocale(user); + } + + /** + * Get the user's configured documentation locale. If no user is available return the config default + * + * @param user the current user + * @return the users documentation locale + */ + public String getDocsLocale(User user) { if (isUserAuthenticated(user)) { String locale = user.getPreferredDocsLocale(); if (locale != null) { diff --git a/java/spacewalk-java.changes.witek.update_monitoring_added b/java/spacewalk-java.changes.witek.update_monitoring_added new file mode 100644 index 000000000000..80f5b5551608 --- /dev/null +++ b/java/spacewalk-java.changes.witek.update_monitoring_added @@ -0,0 +1 @@ +- Extend success message after adding monitoring property (bsc#1212168) From 40bae1f2eb88c856173f84a1286a81220cd6f3af Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:14:41 +0200 Subject: [PATCH 033/127] QE: Wait for pending Salt Jobs after building an image before moving to next build action (#22094) (#22213) (#7375) --- .../sle12sp5_buildhost_build_kiwi_image.feature | 2 ++ .../secondary/buildhost_docker_auth_registry.feature | 1 + .../secondary/buildhost_docker_build_image.feature | 12 ++++++++++-- .../secondary/buildhost_osimage_build_image.feature | 2 ++ testsuite/features/step_definitions/salt_steps.rb | 4 ++-- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/testsuite/features/build_validation/retail/sle12sp5_buildhost_build_kiwi_image.feature b/testsuite/features/build_validation/retail/sle12sp5_buildhost_build_kiwi_image.feature index 3e81863e287c..faa5408c278a 100644 --- a/testsuite/features/build_validation/retail/sle12sp5_buildhost_build_kiwi_image.feature +++ b/testsuite/features/build_validation/retail/sle12sp5_buildhost_build_kiwi_image.feature @@ -36,6 +36,7 @@ Feature: Prepare buildhost and build OS image for SLES 12 SP5 And I select "1-sle12sp5_minion_key" from "activationKey" And I enter the image filename for "sle12sp5_terminal" relative to profiles as "path" And I click on "create-btn" + And I wait until no Salt job is running on "sle12sp5_buildhost" # WORKAROUND # Remove as soon as the issue is fixed @@ -53,6 +54,7 @@ Feature: Prepare buildhost and build OS image for SLES 12 SP5 Then I should see a "[OS Image Build Host]" text When I wait until the image build "suse_os_image_12" is completed And I wait until the image inspection for "sle12sp5_terminal" is completed + And I wait until no Salt job is running on "sle12sp5_buildhost" And I am on the image store of the Kiwi image for organization "1" Then I should see the name of the image for "sle12sp5_terminal" diff --git a/testsuite/features/secondary/buildhost_docker_auth_registry.feature b/testsuite/features/secondary/buildhost_docker_auth_registry.feature index 343ae8614b6e..889c6f69b8aa 100644 --- a/testsuite/features/secondary/buildhost_docker_auth_registry.feature +++ b/testsuite/features/secondary/buildhost_docker_auth_registry.feature @@ -41,6 +41,7 @@ Feature: Build image with authenticated registry # Verify the status of images in the authenticated image store When I wait at most 600 seconds until image "auth_registry_profile" with version "latest" is built successfully via API And I wait at most 300 seconds until image "auth_registry_profile" with version "latest" is inspected successfully via API + And I wait until no Salt job is running on "build_host" And I refresh the page Then table row for "auth_registry_profile" should contain "1" And the list of packages of image "auth_registry_profile" with version "latest" is not empty diff --git a/testsuite/features/secondary/buildhost_docker_build_image.feature b/testsuite/features/secondary/buildhost_docker_build_image.feature index 754f82807013..44b2ab81a52d 100644 --- a/testsuite/features/secondary/buildhost_docker_build_image.feature +++ b/testsuite/features/secondary/buildhost_docker_build_image.feature @@ -83,36 +83,42 @@ Feature: Build container images And I wait at most 600 seconds until image "suse_real_key" with version "latest" is built successfully via API And I wait at most 300 seconds until image "suse_real_key" with version "latest" is inspected successfully via API Then the list of packages of image "suse_real_key" with version "latest" is not empty + When I wait until no Salt job is running on "build_host" Scenario: Build suse_key images with different versions When I schedule the build of image "suse_key" with version "Latest_key-activation1" via API calls And I wait at most 600 seconds until image "suse_key" with version "Latest_key-activation1" is built successfully via API And I wait at most 300 seconds until image "suse_key" with version "Latest_key-activation1" is inspected successfully via API Then the list of packages of image "suse_key" with version "Latest_key-activation1" is not empty - + When I wait until no Salt job is running on "build_host" + Scenario: Build suse_simple image with different versions When I schedule the build of image "suse_simple" with version "Latest_simple" via API calls And I wait at most 600 seconds until image "suse_simple" with version "Latest_simple" is built successfully via API And I wait at most 300 seconds until image "suse_simple" with version "Latest_simple" is inspected successfully via API - Then the list of packages of image "suse_simple" with version "Latest_simple" is not empty + Then the list of packages of image "suse_simple" with version "Latest_simple" is not + When I wait until no Salt job is running on "build_host" Scenario: Delete image via API calls When I delete the image "suse_key" with version "Latest_key-activation1" via API calls And I delete the image "suse_simple" with version "Latest_simple" via API calls Then the image "suse_simple" with version "Latest_key-activation1" doesn't exist via API calls And the image "suse_simple" with version "Latest_simple" doesn't exist via API calls + When I wait until no Salt job is running on "build_host" Scenario: Rebuild suse_simple image When I schedule the build of image "suse_simple" with version "Latest_simple" via API calls And I wait at most 600 seconds until image "suse_simple" with version "Latest_simple" is built successfully via API And I wait at most 300 seconds until image "suse_simple" with version "Latest_simple" is inspected successfully via API Then the list of packages of image "suse_simple" with version "Latest_simple" is not empty + When I wait until no Salt job is running on "build_host" Scenario: Rebuild suse_key image When I schedule the build of image "suse_key" with version "Latest_key-activation1" via API calls And I wait at most 600 seconds until image "suse_key" with version "Latest_key-activation1" is built successfully via API And I wait at most 300 seconds until image "suse_key" with version "Latest_key-activation1" is inspected successfully via API Then the list of packages of image "suse_key" with version "Latest_key-activation1" is not empty + When I wait until no Salt job is running on "build_host" Scenario: Build an image via the GUI When I follow the left menu "Images > Build" @@ -120,6 +126,7 @@ Feature: Build container images And I enter "GUI_BUILT_IMAGE" as "version" And I select the hostname of "build_host" from "buildHostId" And I click on "submit-btn" + And I wait until no Salt job is running on "build_host" Then I wait until I see "GUI_BUILT_IMAGE" text And I wait at most 600 seconds until image "suse_real_key" with version "GUI_BUILT_IMAGE" is built successfully via API And I wait at most 300 seconds until image "suse_real_key" with version "GUI_BUILT_IMAGE" is inspected successfully via API @@ -131,6 +138,7 @@ Feature: Build container images And I enter "GUI_DOCKERADMIN" as "version" And I select the hostname of "build_host" from "buildHostId" And I click on "submit-btn" + And I wait until no Salt job is running on "build_host" Then I wait until I see "GUI_DOCKERADMIN" text And I wait at most 600 seconds until image "suse_real_key" with version "GUI_DOCKERADMIN" is built successfully via API And I wait at most 300 seconds until image "suse_real_key" with version "GUI_DOCKERADMIN" is inspected successfully via API diff --git a/testsuite/features/secondary/buildhost_osimage_build_image.feature b/testsuite/features/secondary/buildhost_osimage_build_image.feature index 0b347fe30c57..2831f3fb4df7 100644 --- a/testsuite/features/secondary/buildhost_osimage_build_image.feature +++ b/testsuite/features/secondary/buildhost_osimage_build_image.feature @@ -29,6 +29,7 @@ Feature: Build OS images And I select "1-SUSE-KEY-x86_64" from "activationKey" And I enter the image filename for "pxeboot_minion" relative to profiles as "path" And I click on "create-btn" + And I wait until no Salt job is running on "build_host" # WORKAROUND # Remove as soon as the issue is fixed @@ -50,6 +51,7 @@ Feature: Build OS images Then I should see a "[OS Image Build Host]" text When I wait until the image build "suse_os_image" is completed And I wait until the image inspection for "pxeboot_minion" is completed + And I wait until no Salt job is running on "build_host" And I am on the image store of the Kiwi image for organization "1" Then I should see the name of the image for "pxeboot_minion" diff --git a/testsuite/features/step_definitions/salt_steps.rb b/testsuite/features/step_definitions/salt_steps.rb index 1d683c6b91cf..5f0e99ba0ac9 100644 --- a/testsuite/features/step_definitions/salt_steps.rb +++ b/testsuite/features/step_definitions/salt_steps.rb @@ -91,8 +91,8 @@ When(/^I wait until no Salt job is running on "([^"]*)"$/) do |minion| target = get_target(minion) salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" - repeat_until_timeout(message: "A Salt job is still running on #{minion}") do - output, _code = target.run("#{salt_call} -lquiet saltutil.running") + repeat_until_timeout(timeout: 360, message: "A Salt job is still running on #{minion}") do + output, _code = target.run("#{salt_call} -lquiet saltutil.running", verbose: true) break if output == "local:\n" sleep 3 end From b9752a48cc8ffde9189a7240dc09ac4d2134bd78 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:17:40 +0200 Subject: [PATCH 034/127] QE: Add a timestamp in the HTML report when a scenario fails (#7376) --- testsuite/features/support/env.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/support/env.rb b/testsuite/features/support/env.rb index 4ce81dcd97a3..929392cf67a1 100644 --- a/testsuite/features/support/env.rb +++ b/testsuite/features/support/env.rb @@ -127,7 +127,7 @@ def enable_assertions click_button('Details') if has_content?('Bootstrap Minions') && has_content?('Details') page.driver.browser.save_screenshot(path) attach path, 'image/png' - attach current_url, 'text/plain' + attach "#{Time.at(@scenario_start_time).strftime('%H:%M:%S:%L')} - #{Time.at(current_epoch).strftime('%H:%M:%S:%L')} | Current URL: #{current_url}", 'text/plain' rescue StandardError => e warn e.message ensure From 7bb20596fd21bf39ab574f55637832d7b3051485 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:29:54 +0200 Subject: [PATCH 035/127] QE: Add more log to debug IPv6 flaky test (#7377) --- testsuite/features/step_definitions/common_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/step_definitions/common_steps.rb b/testsuite/features/step_definitions/common_steps.rb index 26f0b089b218..508f5e43bf3b 100644 --- a/testsuite/features/step_definitions/common_steps.rb +++ b/testsuite/features/step_definitions/common_steps.rb @@ -74,7 +74,7 @@ # confirms that the IPv6 address shown on the page is part of that list and, therefore, valid ipv6_address = find(:xpath, "//td[text()='IPv6 Address:']/following-sibling::td[1]").text log "IPv6 address: #{ipv6_address}" - raise unless ipv6_addresses_list.include? ipv6_address + raise "List of IPv6 addresses: #{ipv6_addresses_list} doesn't include #{ipv6_address}" unless ipv6_addresses_list.include? ipv6_address end Then(/^the system ID for "([^"]*)" should be correct$/) do |host| From 8d279f7a2000990f056576805752d6e0e0a91d0d Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:34:56 +0200 Subject: [PATCH 036/127] PXEBoot: If we raise a previous timeout, we are able to recover and continue with next scenario (#7378) --- testsuite/features/secondary/proxy_cobbler_pxeboot.feature | 6 ++++-- .../secondary/proxy_retail_pxeboot_and_mass_import.feature | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature index 63e7ad10bfb9..26c8a1580328 100644 --- a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature +++ b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature @@ -100,8 +100,10 @@ Feature: PXE boot a terminal with Cobbler And I set the default PXE menu entry to the local boot on the "proxy" And I wait at most 1200 seconds until Salt master sees "pxeboot_minion" as "unaccepted" And I accept "pxeboot_minion" key in the Salt master - And I am on the Systems page - And I wait until I see the name of "pxeboot_minion", refreshing the page + + Scenario: Assure the PXE boot minion is onboarded + Given I am on the Systems page + When I wait until I see the name of "pxeboot_minion", refreshing the page And I wait until onboarding is completed for "pxeboot_minion" Then "pxeboot_minion" should have been reformatted diff --git a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature index 2633d7894adc..29c139da61f5 100644 --- a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature +++ b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature @@ -191,8 +191,10 @@ Feature: PXE boot a Retail terminal When I reboot the Retail terminal "pxeboot_minion" And I wait at most 180 seconds until Salt master sees "pxeboot_minion" as "unaccepted" And I accept "pxeboot_minion" key in the Salt master - And I follow the left menu "Systems > System List > All" - And I wait until I see the name of "pxeboot_minion", refreshing the page + + Scenario: Assure the PXE boot minion is onboarded + Given I am on the Systems page + When I wait until I see the name of "pxeboot_minion", refreshing the page And I follow this "pxeboot_minion" link # Workaround: Increase timeout temporarily get rid of timeout issues And I wait at most 350 seconds until event "Apply states [saltboot] scheduled by (none)" is completed From a7dad441abb29850f35aec57f5c3e53b83fdbc46 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:45:02 +0200 Subject: [PATCH 037/127] QE: Increase some timeouts related to Salt Jobs and refresh page for KVM loading page (#22138) (#7379) --- .../features/secondary/minkvm_guests.feature | 21 ++++++++++++------- .../features/step_definitions/salt_steps.rb | 8 ++++++- testsuite/features/support/lavanda.rb | 8 +++---- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/testsuite/features/secondary/minkvm_guests.feature b/testsuite/features/secondary/minkvm_guests.feature index 93b8e4c9b9cd..47922e8a7e07 100644 --- a/testsuite/features/secondary/minkvm_guests.feature +++ b/testsuite/features/secondary/minkvm_guests.feature @@ -61,7 +61,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Edit a KVM virtual machine When I click on "Edit" in row "test-vm" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page Then I should see "1024" in field identified by "memory" And I should see "1" in field identified by "vcpu" And option "VNC" is selected as "graphicsType" @@ -83,7 +84,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Add a network interface to a KVM virtual machine When I click on "Edit" in row "test-vm" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I click on "add_network" And I select "test-net1" from "network1_source" And I click on "Update" @@ -92,7 +94,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Delete a network interface from a KVM virtual machine When I click on "Edit" in row "test-vm" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I click on "remove_network1" And I click on "Update" Then I should see a "Hosted Virtual Systems" text @@ -100,7 +103,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Add a disk and a cdrom to a KVM virtual machine When I click on "Edit" in row "test-vm" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I click on "add_disk" And I click on "add_disk" And I select "CDROM" from "disk2_device" @@ -114,7 +118,8 @@ Feature: Be able to manage KVM virtual machines via the GUI When I click on "Edit" in row "test-vm" And I wait until I do not see "Loading..." text And I store "" into file "/tmp/test-image.iso" on "kvm_server" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I enter "/tmp/test-image.iso" as "disk2_source_file" And I click on "Update" Then I should see a "Hosted Virtual Systems" text @@ -122,7 +127,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Delete a disk from a KVM virtual machine When I click on "Edit" in row "test-vm" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I click on "remove_disk2" And I click on "Update" Then I should see a "Hosted Virtual Systems" text @@ -256,7 +262,8 @@ Feature: Be able to manage KVM virtual machines via the GUI Scenario: Delete a virtual volume When I follow "Storage" - And I wait until I do not see "Loading..." text + # WORKAROUND: bsc#1213220 Virtualization page stuck on Loading + And I wait until I do not see "Loading..." text, refreshing the page And I open the sub-list of the product "tmp" And I click on "Delete" in tree item "test-net0.xml" And I click on "Delete" in "Delete Virtual Storage Volume" modal diff --git a/testsuite/features/step_definitions/salt_steps.rb b/testsuite/features/step_definitions/salt_steps.rb index 5f0e99ba0ac9..3faa8726354b 100644 --- a/testsuite/features/step_definitions/salt_steps.rb +++ b/testsuite/features/step_definitions/salt_steps.rb @@ -91,7 +91,7 @@ When(/^I wait until no Salt job is running on "([^"]*)"$/) do |minion| target = get_target(minion) salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" - repeat_until_timeout(timeout: 360, message: "A Salt job is still running on #{minion}") do + repeat_until_timeout(timeout: 600, message: "A Salt job is still running on #{minion}") do output, _code = target.run("#{salt_call} -lquiet saltutil.running", verbose: true) break if output == "local:\n" sleep 3 @@ -312,6 +312,12 @@ end end +When(/^I wait until there is no Salt job calling the module "([^"]*)" on "([^"]*)"$/) do |salt_module, minion| + target = get_target(minion) + salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" + target.run_until_fail("#{salt_call} -lquiet saltutil.running | grep #{salt_module}", timeout: 600) +end + def pillar_get(key, minion) system_name = get_system_name(minion) if minion == 'sle_minion' diff --git a/testsuite/features/support/lavanda.rb b/testsuite/features/support/lavanda.rb index 79e8bbe9c3d3..732e2347b19c 100644 --- a/testsuite/features/support/lavanda.rb +++ b/testsuite/features/support/lavanda.rb @@ -166,8 +166,8 @@ def run(cmd, separated_results: false, check_errors: true, timeout: DEFAULT_TIME # # Args: # cmd: The command to run. - def run_until_ok(cmd) - repeat_until_timeout(report_result: true) do + def run_until_ok(cmd, timeout: DEFAULT_TIMEOUT) + repeat_until_timeout(timeout: timeout, report_result: true) do result, code = run(cmd, check_errors: false) break if code.zero? sleep 2 @@ -180,8 +180,8 @@ def run_until_ok(cmd) # # Args: # cmd: The command to run. - def run_until_fail(cmd) - repeat_until_timeout(report_result: true) do + def run_until_fail(cmd, timeout: DEFAULT_TIMEOUT) + repeat_until_timeout(timeout: timeout, report_result: true) do result, code = run(cmd, check_errors: false) break if code.nonzero? sleep 2 From dedaef2b90a57770bfcd4d289487b447b8f6db3d Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Mon, 7 Aug 2023 12:49:45 +0200 Subject: [PATCH 038/127] QE: Refactor how we wait for Hardware refresh action by specifying the salt job to wait (#22095) (#7380) --- .../retail/proxy_branch_network.feature | 1 + .../init_clients/proxy_branch_network.feature | 1 + .../allcli_overview_systems_details.feature | 14 +++++++++----- .../secondary/min_salt_mgrcompat_state.feature | 9 ++++++--- .../secondary/min_salt_minion_details.feature | 3 ++- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/testsuite/features/build_validation/retail/proxy_branch_network.feature b/testsuite/features/build_validation/retail/proxy_branch_network.feature index 0156a01b9687..d682e334e80b 100644 --- a/testsuite/features/build_validation/retail/proxy_branch_network.feature +++ b/testsuite/features/build_validation/retail/proxy_branch_network.feature @@ -197,6 +197,7 @@ Feature: Prepare the branch server for PXE booting And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "proxy" And I follow "Details" in the content area And I follow "Hardware" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/init_clients/proxy_branch_network.feature b/testsuite/features/init_clients/proxy_branch_network.feature index ed03a2b9d389..ebb5536328b2 100644 --- a/testsuite/features/init_clients/proxy_branch_network.feature +++ b/testsuite/features/init_clients/proxy_branch_network.feature @@ -225,6 +225,7 @@ Feature: Setup Uyuni for Retail branch network And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "proxy" And I follow "Details" in the content area And I follow "Hardware" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/secondary/allcli_overview_systems_details.feature b/testsuite/features/secondary/allcli_overview_systems_details.feature index 7170e6b4036f..f9de2dc7abf4 100644 --- a/testsuite/features/secondary/allcli_overview_systems_details.feature +++ b/testsuite/features/secondary/allcli_overview_systems_details.feature @@ -12,7 +12,8 @@ Feature: The system details of each minion and client provides an overview of th When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "sle_minion" @sle_minion Scenario: Minion grains are displayed correctly on the details page @@ -33,7 +34,8 @@ Feature: The system details of each minion and client provides an overview of th When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "rhlike_minion" @rhlike_minion Scenario: Red Hat-like minion grains are displayed correctly on the details page @@ -54,7 +56,8 @@ Feature: The system details of each minion and client provides an overview of th When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "deblike_minion" @deblike_minion Scenario: Debian-like minion grains are displayed correctly on the details page @@ -75,9 +78,10 @@ Feature: The system details of each minion and client provides an overview of th When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "ssh_minion" -@ssh_minion + @ssh_minion Scenario: SSH-managed minion grains are displayed correctly on the details page Given I am on the Systems overview page of this "ssh_minion" Then the hostname for "ssh_minion" should be correct diff --git a/testsuite/features/secondary/min_salt_mgrcompat_state.feature b/testsuite/features/secondary/min_salt_mgrcompat_state.feature index 4322d2f04969..2aa9bbbd6526 100644 --- a/testsuite/features/secondary/min_salt_mgrcompat_state.feature +++ b/testsuite/features/secondary/min_salt_mgrcompat_state.feature @@ -27,7 +27,8 @@ Feature: Verify that Salt mgrcompat state works when the new module.run syntax i When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "sle_minion" Scenario: Remove saltutil grain and mgrcompat module from minion and schedule Hardware Refresh Given I remove "minion/extmods/states/mgrcompat.py" from salt cache on "sle_minion" @@ -38,7 +39,8 @@ Feature: Verify that Salt mgrcompat state works when the new module.run syntax i When I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "sle_minion" Scenario: Delete SLES minion system profile before mgrcompat test Given I am on the Systems overview page of this "sle_minion" @@ -78,7 +80,8 @@ Feature: Verify that Salt mgrcompat state works when the new module.run syntax i And I follow "Hardware" And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "sle_minion" Scenario: Cleanup: Delete profile of the minion and disable new module.run syntax Given I am on the Systems overview page of this "sle_minion" diff --git a/testsuite/features/secondary/min_salt_minion_details.feature b/testsuite/features/secondary/min_salt_minion_details.feature index 8ac412278a4d..bf83f3028c64 100644 --- a/testsuite/features/secondary/min_salt_minion_details.feature +++ b/testsuite/features/secondary/min_salt_minion_details.feature @@ -23,7 +23,8 @@ Feature: Verify the minion registration And I follow "Hardware" in the content area And I click on "Schedule Hardware Refresh" Then I should see a "You have successfully scheduled a hardware profile refresh" text - And I wait until event "Hardware List Refresh scheduled by admin" is completed + When I wait until event "Hardware List Refresh scheduled by admin" is completed + And I wait until there is no Salt job calling the module "hardware.profileupdate" on "sle_minion" Scenario: Check that Update Properties button works When I follow "Details" in the content area From 1b94c5d72ac7b5162e6774ca770f9fe2d819c095 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Mon, 7 Aug 2023 14:39:16 +0200 Subject: [PATCH 039/127] QE: Fix Uyuni reposync for openSUSE Leap 15.4 (#7374) --- testsuite/features/support/commonlib.rb | 7 ++++++- testsuite/features/support/constants.rb | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb index 228fda73e5e0..e469351bdc37 100644 --- a/testsuite/features/support/commonlib.rb +++ b/testsuite/features/support/commonlib.rb @@ -30,7 +30,12 @@ def generate_temp_file(name, content) # This is a safety net only, the best thing to do is to not start the reposync at all. def compute_channels_to_leave_running # keep the repos needed for the auto-installation tests - do_not_kill = CHANNEL_TO_SYNCH_BY_OS_VERSION['default'] + do_not_kill = + if $product == 'Uyuni' + CHANNEL_TO_SYNCH_BY_OS_VERSION['15.4'] + else + CHANNEL_TO_SYNCH_BY_OS_VERSION['default'] + end [$minion, $build_host, $ssh_minion, $rhlike_minion].each do |node| next unless node os_version = node.os_version diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb index a605ac65f0d0..7df9ec17d57c 100644 --- a/testsuite/features/support/constants.rb +++ b/testsuite/features/support/constants.rb @@ -454,6 +454,17 @@ res8-manager-tools-pool-x86_64 res8-manager-tools-updates-x86_64 sll8-uyuni-client-x86_64 + ], + '15.4' => + %w[ + opensuse_leap15_4-x86_64 + opensuse_leap15_4-x86_64-non-oss + opensuse_leap15_4-x86_64-non-oss-updates + opensuse_leap15_4-x86_64-updates + opensuse_leap15_4-x86_64-backports-updates + opensuse_leap15_4-x86_64-sle-updates + uyuni-proxy-devel-leap-x86_64 + opensuse_leap15_4-uyuni-client-x86_64 ] }.freeze From 9c29b920dddc2bdb26b84e42dfd3383a123f6374 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:49:26 +1200 Subject: [PATCH 040/127] Differency monitoring from sleminion (#7369) --- testsuite/features/step_definitions/api_common.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/testsuite/features/step_definitions/api_common.rb b/testsuite/features/step_definitions/api_common.rb index cfe75553ceac..1351498f369f 100644 --- a/testsuite/features/step_definitions/api_common.rb +++ b/testsuite/features/step_definitions/api_common.rb @@ -261,7 +261,6 @@ client.sub! 'ssh_minion', 'minion' client.sub! 'buildhost', 'minion' client.sub! 'terminal', 'minion' - client.sub! 'monitoring_server', 'sle15sp4_minion' custom_channel = if client.include? 'alma9' 'no-appstream-alma-9-result-custom_channel_alma9_minion' elsif client.include? 'liberty9' From 23c592f433e41edf810e7eb068f06f5a079aae97 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:51:48 +1200 Subject: [PATCH 041/127] Check Overview Page is correctly loaded before looking for system (#7371) --- testsuite/features/step_definitions/navigation_steps.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index ebf47cfb99af..7aefa7f13ec4 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -110,6 +110,7 @@ end When(/^I wait until I see the name of "([^"]*)", refreshing the page$/) do |host| + raise 'Overview System page didn\'t load' unless has_content?('System Overview') system_name = get_system_name(host) step %(I wait until I see the "#{system_name}" system, refreshing the page) end From 28dbd3e094ef907f56e870721a2c559444be3604 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:52:09 +1200 Subject: [PATCH 042/127] Check login page is correctly loaded (#7372) --- testsuite/features/step_definitions/navigation_steps.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index 7aefa7f13ec4..36758fc55337 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -533,6 +533,7 @@ find(:xpath, "//header//i[@class='fa fa-sign-out']").click if all(:xpath, "//header//i[@class='fa fa-sign-out']", wait: 0).any? + raise 'Login page is not correctly loaded' unless has_field?('username') fill_in('username', with: user) fill_in('password', with: passwd) click_button_and_wait('Sign In', match: :first) From 0a0b7d3addcb26dcd254f329058e42554b53fab3 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:53:57 +1200 Subject: [PATCH 043/127] Add waiting text checks between event click link (#7373) --- testsuite/features/step_definitions/common_steps.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testsuite/features/step_definitions/common_steps.rb b/testsuite/features/step_definitions/common_steps.rb index 508f5e43bf3b..09a9f2678bb1 100644 --- a/testsuite/features/step_definitions/common_steps.rb +++ b/testsuite/features/step_definitions/common_steps.rb @@ -142,12 +142,16 @@ # same name in the events history - however, that's the best we have so far. steps %( When I follow "Events" + And I wait until I see "Pending Events" text And I follow "Pending" + And I wait until I see "Pending Events" text And I wait at most #{pickup_timeout} seconds until I do not see "#{event}" text, refreshing the page And I follow "History" And I wait until I see "System History" text And I wait until I see "#{event}" text, refreshing the page And I follow first "#{event}" + And I wait until I see "This action will be executed after" text + And I wait until I see "#{event}" text And I wait at most #{complete_timeout} seconds until the event is completed, refreshing the page ) end From 2fc0089d905a712898e40c9c2d19c2d335734114 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Tue, 8 Aug 2023 12:35:09 +0200 Subject: [PATCH 044/127] QE: Lazy initialization of Twopence nodes (#7334) --- .../init_clients/sle_ssh_minion.feature | 5 +- .../features/step_definitions/api_common.rb | 10 +- .../step_definitions/cobbler_steps.rb | 94 ++-- .../step_definitions/command_steps.rb | 347 ++++++++------- .../features/step_definitions/common_steps.rb | 16 +- .../content_lifecycle_steps.rb | 6 +- .../features/step_definitions/docker_steps.rb | 4 +- .../step_definitions/file_management_steps.rb | 16 +- .../step_definitions/navigation_steps.rb | 2 +- .../features/step_definitions/retail_steps.rb | 72 +-- .../features/step_definitions/salt_steps.rb | 88 ++-- .../features/step_definitions/setup_steps.rb | 8 +- .../features/step_definitions/smdba_steps.rb | 60 +-- testsuite/features/support/code_coverage.rb | 6 +- testsuite/features/support/commonlib.rb | 115 ++++- testsuite/features/support/constants.rb | 65 +++ testsuite/features/support/env.rb | 164 +++---- testsuite/features/support/lavanda.rb | 4 +- .../features/support/namespaces/system.rb | 4 +- testsuite/features/support/twopence_env.rb | 43 ++ testsuite/features/support/twopence_init.rb | 412 +++--------------- 21 files changed, 718 insertions(+), 823 deletions(-) create mode 100644 testsuite/features/support/twopence_env.rb diff --git a/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature b/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature index 528d96518940..2c1d74e23103 100644 --- a/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature +++ b/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature @@ -11,12 +11,12 @@ Feature: Bootstrap a Salt host managed via salt-ssh When I follow the left menu "Systems > Bootstrapping" Then I should see a "Bootstrap Minions" text When I check "manageWithSSH" - And I enter the hostname of "opensusessh" as "hostname" + And I enter the hostname of "ssh_minion" as "hostname" And I enter "linux" as "password" And I click on "Bootstrap" And I wait until I see "Successfully bootstrapped host!" text And I follow the left menu "Systems > System List > All" - And I wait until I see the name of "opensusessh", refreshing the page + And I wait until I see the name of "ssh_minion", refreshing the page Scenario: Subscribe the SSH minion to a base channel Given I am on the Systems overview page of this "ssh_minion" @@ -31,4 +31,3 @@ Feature: Bootstrap a Salt host managed via salt-ssh When I click on "Confirm" Then I should see a "Changing the channels has been scheduled." text And I wait until event "Subscribe channels scheduled by admin" is completed - diff --git a/testsuite/features/step_definitions/api_common.rb b/testsuite/features/step_definitions/api_common.rb index 1351498f369f..d54b41b9b66b 100644 --- a/testsuite/features/step_definitions/api_common.rb +++ b/testsuite/features/step_definitions/api_common.rb @@ -14,9 +14,9 @@ end $api_test = if $debug_mode - ApiTestXmlrpc.new($server.full_hostname) + ApiTestXmlrpc.new(get_target('server').full_hostname) else - $product == 'Uyuni' ? ApiTestHttp.new($server.full_hostname, ssl_verify) : ApiTestXmlrpc.new($server.full_hostname) + product == 'Uyuni' ? ApiTestHttp.new(get_target('server').full_hostname, ssl_verify) : ApiTestXmlrpc.new(get_target('server').full_hostname) end ## system namespace @@ -49,7 +49,7 @@ but with activation key with default contact method, I should get an API fault$/) do exception_thrown = false begin - $api_test.system.bootstrap_system($minion.full_hostname, '1-SUSE-KEY-x86_64', true) + $api_test.system.bootstrap_system(get_target('sle_minion').full_hostname, '1-SUSE-KEY-x86_64', true) rescue exception_thrown = true end @@ -80,7 +80,7 @@ end When(/^I wait for the OpenSCAP audit to finish$/) do - @sle_id = $api_test.system.retrieve_server_id($minion.full_hostname) + @sle_id = $api_test.system.retrieve_server_id(get_target('sle_minion').full_hostname) begin repeat_until_timeout(message: 'Process did not complete') do scans = $api_test.system.scap.list_xccdf_scans(@sle_id) @@ -142,7 +142,7 @@ ## channel namespace When(/^I create a repo with label "([^"]*)" and url$/) do |label| - url = "http://#{$server.full_hostname}/pub/AnotherRepo/" + url = "http://#{get_target('server').full_hostname}/pub/AnotherRepo/" assert($api_test.channel.software.create_repo(label, url)) end diff --git a/testsuite/features/step_definitions/cobbler_steps.rb b/testsuite/features/step_definitions/cobbler_steps.rb index de1d03bf3484..8e54bbdf4866 100644 --- a/testsuite/features/step_definitions/cobbler_steps.rb +++ b/testsuite/features/step_definitions/cobbler_steps.rb @@ -11,7 +11,7 @@ end When(/^I restart cobbler on the server$/) do - $server.run('systemctl restart cobblerd.service') + get_target('server').run('systemctl restart cobblerd.service') end Given(/^I am logged in via the Cobbler API as user "([^"]*)" with password "([^"]*)"$/) do |user, pwd| @@ -66,12 +66,12 @@ end When(/^I remove kickstart profiles and distros$/) do - host = $server.full_hostname + host = get_target('server').full_hostname # ------------------------------- # Cleanup kickstart distros and their profiles, if any. # Get all distributions: created from UI or from API. - distros = $server.run('cobbler distro list')[0].split + distros = get_target('server').run('cobbler distro list')[0].split # The name of distros created in the UI has the form: distro_label + suffix user_details = $api_test.user.get_details('testing') @@ -84,17 +84,17 @@ # Remove profiles and distros created with the API. # We have already deleted the profiles from the UI; delete all the remaning ones. - profiles = $server.run('cobbler profile list')[0].split - profiles.each { |profile| $server.run("cobbler profile remove --name '#{profile}'") } - distros_api.each { |distro| $server.run("cobbler distro remove --name '#{distro}'") } + profiles = get_target('server').run('cobbler profile list')[0].split + profiles.each { |profile| get_target('server').run("cobbler profile remove --name '#{profile}'") } + distros_api.each { |distro| get_target('server').run("cobbler distro remove --name '#{distro}'") } end # cobbler reports When(/^I trigger cobbler system record on the "([^"]*)"$/) do |host| space = 'spacecmd -u admin -p admin' system_name = get_system_name(host) - $server.run("#{space} clear_caches") - out, _code = $server.run("#{space} system_details #{system_name}") + get_target('server').run("#{space} clear_caches") + out, _code = get_target('server').run("#{space} system_details #{system_name}") unless out.include? 'ssh-push-tunnel' steps %( Given I am authorized as "testing" with password "testing" @@ -109,28 +109,28 @@ Then(/^the cobbler report should contain "([^"]*)" for "([^"]*)"$/) do |text, host| node = get_target(host) - output, _code = $server.run("cobbler system report --name #{node.full_hostname}:1", check_errors: false) + output, _code = get_target('server').run("cobbler system report --name #{node.full_hostname}:1", check_errors: false) raise "Not found:\n#{output}" unless output.include?(text) end Then(/^the cobbler report should contain "([^"]*)" for cobbler system name "([^"]*)"$/) do |text, name| - output, _code = $server.run("cobbler system report --name #{name}", check_errors: false) + output, _code = get_target('server').run("cobbler system report --name #{name}", check_errors: false) raise "Not found:\n#{output}" unless output.include?(text) end # buildiso When(/^I prepare Cobbler for the buildiso command$/) do tmp_dir = '/var/cache/cobbler/buildiso' - $server.run("mkdir -p #{tmp_dir}") + get_target('server').run("mkdir -p #{tmp_dir}") # we need bootloaders for the buildiso command - out, code = $server.run('cobbler mkloaders', verbose: true) + out, code = get_target('server').run('cobbler mkloaders', verbose: true) raise "error in cobbler mkloaders.\nLogs:\n#{out}" if code.nonzero? end When(/^I run Cobbler buildiso for distro "([^"]*)" and all profiles$/) do |distro| tmp_dir = '/var/cache/cobbler/buildiso' iso_dir = '/var/cache/cobbler' - out, code = $server.run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/profile_all.iso --distro=#{distro}", verbose: true) + out, code = get_target('server').run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/profile_all.iso --distro=#{distro}", verbose: true) raise "error in cobbler buildiso.\nLogs:\n#{out}" if code.nonzero? profiles = %w[orchid flame pearl] @@ -138,10 +138,10 @@ cobbler_profiles = [] profiles.each do |profile| # get all profiles from Cobbler - result_cobbler, code = $server.run("cobbler profile list | grep -o #{profile}", verbose: true) + result_cobbler, code = get_target('server').run("cobbler profile list | grep -o #{profile}", verbose: true) cobbler_profiles.push(result_cobbler) if code.zero? # get all profiles from isolinux.cfg - result_isolinux, code = $server.run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o #{profile} | cut -c -6 | head -n 1") + result_isolinux, code = get_target('server').run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o #{profile} | cut -c -6 | head -n 1") unless result_isolinux.empty? isolinux_profiles.push(result_isolinux) end @@ -152,17 +152,17 @@ When(/^I run Cobbler buildiso for distro "([^"]*)" and profile "([^"]*)"$/) do |distro, profile| tmp_dir = '/var/cache/cobbler/buildiso' iso_dir = '/var/cache/cobbler' - out, code = $server.run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{profile}.iso --distro=#{distro} --profile=#{profile}", verbose: true) + out, code = get_target('server').run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{profile}.iso --distro=#{distro} --profile=#{profile}", verbose: true) raise "error in cobbler buildiso.\nLogs:\n#{out}" if code.nonzero? end When(/^I run Cobbler buildiso for distro "([^"]*)" and profile "([^"]*)" without dns entries$/) do |distro, profile| tmp_dir = '/var/cache/cobbler/buildiso' iso_dir = '/var/cache/cobbler' - out, code = $server.run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{profile}.iso --distro=#{distro} --profile=#{profile} --exclude-dns", verbose: true) + out, code = get_target('server').run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{profile}.iso --distro=#{distro} --profile=#{profile} --exclude-dns", verbose: true) raise "error in cobbler buildiso.\nLogs:\n#{out}" if code.nonzero? - result, code = $server.run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o nameserver", check_errors: false) + result, code = get_target('server').run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o nameserver", check_errors: false) # we have to fail here if the command suceeds raise "error in Cobbler buildiso, nameserver parameter found in isolinux.cfg but should not be found.\nLogs:\n#{result}" if code.zero? end @@ -174,60 +174,60 @@ tmp_dir = '/var/cache/cobbler/buildiso' iso_dir = '/var/cache/cobbler' source_dir = "/var/cache/cobbler/source_#{param}" - $server.run("mv #{tmp_dir} #{source_dir}") - $server.run("mkdir -p #{tmp_dir}") - out, code = $server.run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{param}.iso --distro=#{distro} --#{param} --source=#{source_dir}", verbose: true) + get_target('server').run("mv #{tmp_dir} #{source_dir}") + get_target('server').run("mkdir -p #{tmp_dir}") + out, code = get_target('server').run("cobbler buildiso --tempdir=#{tmp_dir} --iso #{iso_dir}/#{param}.iso --distro=#{distro} --#{param} --source=#{source_dir}", verbose: true) raise "error in cobbler buildiso.\nLogs:\n#{out}" if code.nonzero? end When(/^I check Cobbler buildiso ISO "([^"]*)" with xorriso$/) do |name| tmp_dir = '/var/cache/cobbler' - out, code = $server.run("cat >#{tmp_dir}/test_image <<-EOF + out, code = get_target('server').run("cat >#{tmp_dir}/test_image <<-EOF BIOS UEFI EOF") xorriso = "xorriso -indev #{tmp_dir}/#{name}.iso -report_el_torito 2>/dev/null" iso_filter = "awk '/^El Torito boot img[[:space:]]+:[[:space:]]+[0-9]+[[:space:]]+[a-zA-Z]+[[:space:]]+y/{print $7}'" iso_file = "#{tmp_dir}/xorriso_#{name}" - out, code = $server.run("#{xorriso} | #{iso_filter} >> #{iso_file}") + out, code = get_target('server').run("#{xorriso} | #{iso_filter} >> #{iso_file}") raise "error while executing xorriso.\nLogs:\n#{out}" if code.nonzero? - out, code = $server.run("diff #{tmp_dir}/test_image #{tmp_dir}/xorriso_#{name}") + out, code = get_target('server').run("diff #{tmp_dir}/test_image #{tmp_dir}/xorriso_#{name}") raise "error in verifying Cobbler buildiso image with xorriso.\nLogs:\n#{out}" if code.nonzero? end # xorriso When(/^I cleanup xorriso temp files$/) do - $server.run('rm /var/cache/cobbler/xorriso_*', check_errors: false) + get_target('server').run('rm /var/cache/cobbler/xorriso_*', check_errors: false) end # cobbler settings Given(/^cobbler settings are successfully migrated$/) do - out, code = $server.run('cobbler-settings migrate -t /etc/cobbler/settings.yaml') + out, code = get_target('server').run('cobbler-settings migrate -t /etc/cobbler/settings.yaml') raise "error when running cobbler-settings to migrate current settings.\nLogs:\n#{out}" if code.nonzero? end # cobbler parameters Then(/^I add the Cobbler parameter "([^"]*)" with value "([^"]*)" to item "(distro|profile|system)" with name "([^"]*)"$/) do |param, value, item, name| - result, code = $server.run("cobbler #{item} edit --name=#{name} --#{param}=#{value}", verbose: true) + result, code = get_target('server').run("cobbler #{item} edit --name=#{name} --#{param}=#{value}", verbose: true) puts("cobbler #{item} edit --name #{name} #{param}=#{value}") raise "error in adding parameter and value to Cobbler #{item}.\nLogs:\n#{result}" if code.nonzero? end When(/^I check the Cobbler parameter "([^"]*)" with value "([^"]*)" in the isolinux.cfg$/) do |param, value| tmp_dir = '/var/cache/cobbler/buildiso' - result, code = $server.run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o #{param}=#{value}") + result, code = get_target('server').run("cat #{tmp_dir}/isolinux/isolinux.cfg | grep -o #{param}=#{value}") raise "error while verifying isolinux.cfg parameter for Cobbler buildiso.\nLogs:\n#{result}" if code.nonzero? end # backup step When(/^I backup Cobbler settings file$/) do - $server.run('cp /etc/cobbler/settings.yaml /etc/cobbler/settings.yaml.bak 2> /dev/null', check_errors: false) + get_target('server').run('cp /etc/cobbler/settings.yaml /etc/cobbler/settings.yaml.bak 2> /dev/null', check_errors: false) end # cleanup steps When(/^I cleanup after Cobbler buildiso$/) do - result, code = $server.run('rm -Rf /var/cache/cobbler') + result, code = get_target('server').run('rm -Rf /var/cache/cobbler') raise "Error during Cobbler buildiso cleanup.\nLogs:\n#{result}" if code.nonzero? end @@ -235,11 +235,11 @@ cleanup_command = 'rm /var/lib/cobbler/collections/**/*.json 2> /dev/null && ' \ 'rm -r /srv/tftpboot 2> /dev/null && ' \ 'cp /etc/cobbler/settings.yaml.bak /etc/cobbler/settings.yaml 2> /dev/null' - $server.run(cleanup_command.to_s, check_errors: false) - result, code = $server.run('systemctl restart apache') + get_target('server').run(cleanup_command.to_s, check_errors: false) + result, code = get_target('server').run('systemctl restart apache') raise "Error while restarting apache cleanup.\nLogs:\n#{result}" if code.nonzero? - result, code = $server.run('systemctl restart apache && systemctl restart cobblerd') + result, code = get_target('server').run('systemctl restart apache && systemctl restart cobblerd') raise "Error while restarting cobblerd.\nLogs:\n#{result}" if code.nonzero? step %(I wait until "cobblerd" service is active on "server") @@ -248,32 +248,32 @@ # cobbler commands When(/^I copy autoinstall mocked files on server$/) do target_dirs = '/var/autoinstall/Fedora_12_i386/images/pxeboot /var/autoinstall/SLES15-SP4-x86_64/DVD1/boot/x86_64/loader /var/autoinstall/mock' - $server.run("mkdir -p #{target_dirs}") + get_target('server').run("mkdir -p #{target_dirs}") base_dir = File.dirname(__FILE__) + '/../upload_files/autoinstall/cobbler/' source_dir = '/var/autoinstall/' return_codes = [] - return_codes << file_inject($server, base_dir + 'fedora12/vmlinuz', source_dir + 'Fedora_12_i386/images/pxeboot/vmlinuz') - return_codes << file_inject($server, base_dir + 'fedora12/initrd.img', source_dir + 'Fedora_12_i386/images/pxeboot/initrd.img') - return_codes << file_inject($server, base_dir + 'mock/empty.xml', source_dir + 'mock/empty.xml') - return_codes << file_inject($server, base_dir + 'sles15sp4/initrd', source_dir + 'SLES15-SP4-x86_64/DVD1/boot/x86_64/loader/initrd') - return_codes << file_inject($server, base_dir + 'sles15sp4/linux', source_dir + 'SLES15-SP4-x86_64/DVD1/boot/x86_64/loader/linux') + return_codes << file_inject(get_target('server'), base_dir + 'fedora12/vmlinuz', source_dir + 'Fedora_12_i386/images/pxeboot/vmlinuz') + return_codes << file_inject(get_target('server'), base_dir + 'fedora12/initrd.img', source_dir + 'Fedora_12_i386/images/pxeboot/initrd.img') + return_codes << file_inject(get_target('server'), base_dir + 'mock/empty.xml', source_dir + 'mock/empty.xml') + return_codes << file_inject(get_target('server'), base_dir + 'sles15sp4/initrd', source_dir + 'SLES15-SP4-x86_64/DVD1/boot/x86_64/loader/initrd') + return_codes << file_inject(get_target('server'), base_dir + 'sles15sp4/linux', source_dir + 'SLES15-SP4-x86_64/DVD1/boot/x86_64/loader/linux') raise 'File injection failed' unless return_codes.all?(&:zero?) end When(/^I run Cobbler sync (with|without) error checking$/) do |checking| if checking == 'with' - out, _code = $server.run('cobbler sync') + out, _code = get_target('server').run('cobbler sync') raise 'cobbler sync failed' if out.include? 'Push failed' else - _out, _code = $server.run('cobbler sync') + _out, _code = get_target('server').run('cobbler sync') end end When(/^I start local monitoring of Cobbler$/) do cobbler_conf_file = '/etc/cobbler/logging_config.conf' cobbler_log_file = '/var/log/cobbler/cobbler_debug.log' - $server.run("rm #{cobbler_log_file}", check_errors: false) - _result, code = $server.run("test -f #{cobbler_conf_file}.old", check_errors: false) + get_target('server').run("rm #{cobbler_log_file}", check_errors: false) + _result, code = get_target('server').run("test -f #{cobbler_conf_file}.old", check_errors: false) if !code.zero? handler_name = 'FileLogger02' formatter_name = 'JSONlogfile' @@ -294,9 +294,9 @@ "line_number=`awk \"/\\\[logger_root\\\]/{ print NR; exit }\" #{cobbler_conf_file}` && " \ "sed -e \"$(($line_number + 2))s/$/,#{handler_name}/\" -i #{cobbler_conf_file} && " \ "echo -e #{handler_class} >> #{cobbler_conf_file}" - $server.run("#{command} && systemctl restart cobblerd") + get_target('server').run("#{command} && systemctl restart cobblerd") else - $server.run('systemctl restart cobblerd') + get_target('server').run('systemctl restart cobblerd') end # give cobbler a few seconds to come up sleep 3 @@ -305,13 +305,13 @@ Then(/^the local logs for Cobbler should not contain errors$/) do cobbler_log_file = '/var/log/cobbler/cobbler_debug.log' local_file = '/tmp/cobbler_debug.log' - return_code = file_extract($server, cobbler_log_file, local_file) + return_code = file_extract(get_target('server'), cobbler_log_file, local_file) raise 'File extraction failed' unless return_code.zero? file_data = File.read(local_file).gsub!("\n", ',').chop.gsub('"', " ' ").gsub("\\''", '"') file_data = "[#{file_data}]" data_hash = JSON.parse(file_data) output = data_hash.select { |key, _hash| key['levelname'] == 'ERROR' } - $server.run("cp #{cobbler_log_file} #{cobbler_log_file}$(date +\"%Y_%m_%d_%I_%M_%p\")") unless output.empty? + get_target('server').run("cp #{cobbler_log_file} #{cobbler_log_file}$(date +\"%Y_%m_%d_%I_%M_%p\")") unless output.empty? raise "Errors in Cobbler logs:\n #{output}" unless output.empty? end diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb index 7b805f2d68fb..2ac1a2adaa54 100644 --- a/testsuite/features/step_definitions/command_steps.rb +++ b/testsuite/features/step_definitions/command_steps.rb @@ -38,26 +38,26 @@ end Then(/^I turn off disable_local_repos for all clients/) do - $server.run("echo \"mgr_disable_local_repos: False\" > /srv/pillar/disable_local_repos_off.sls") + get_target('server').run("echo \"mgr_disable_local_repos: False\" > /srv/pillar/disable_local_repos_off.sls") step %(I install a salt pillar top file for "salt_bundle_config, disable_local_repos_off" with target "*" on the server) end Then(/^"([^"]*)" should communicate with the server using public interface/) do |host| node = get_target(host) - _result, return_code = node.run("ping -c 1 -I #{node.public_interface} #{$server.public_ip}", check_errors: false) + _result, return_code = node.run("ping -c 1 -I #{node.public_interface} #{get_target('server').public_ip}", check_errors: false) unless return_code.zero? sleep 2 puts "re-try ping" - node.run("ping -c 1 -I #{node.public_interface} #{$server.public_ip}") + node.run("ping -c 1 -I #{node.public_interface} #{get_target('server').public_ip}") end - $server.run("ping -c 1 #{node.public_ip}") + get_target('server').run("ping -c 1 #{node.public_ip}") end Then(/^"([^"]*)" should not communicate with the server using private interface/) do |host| node = get_target(host) - node.run_until_fail("ping -c 1 -I #{node.private_interface} #{$server.public_ip}") + node.run_until_fail("ping -c 1 -I #{node.private_interface} #{get_target('server').public_ip}") # commented out as a machine with the same IP address might exist somewhere in our engineering network - # $server.run_until_fail("ping -c 1 #{node.private_ip}") + # get_target('server').run_until_fail("ping -c 1 #{node.private_ip}") end Then(/^the clock from "([^"]*)" should be exact$/) do |host| @@ -70,27 +70,27 @@ Then(/^it should be possible to reach the test packages$/) do url = 'https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/rpm/x86_64/orion-dummy-1.1-1.1.x86_64.rpm' - $server.run("curl --insecure --location #{url} --output /dev/null") + get_target('server').run("curl --insecure --location #{url} --output /dev/null") end Then(/^it should be possible to use the HTTP proxy$/) do url = 'https://www.suse.com' proxy = "suma2:P4$$wordWith%and&@#{$server_http_proxy}" - $server.run("curl --insecure --proxy '#{proxy}' --proxy-anyauth --location '#{url}' --output /dev/null") + get_target('server').run("curl --insecure --proxy '#{proxy}' --proxy-anyauth --location '#{url}' --output /dev/null") end Then(/^it should be possible to use the custom download endpoint$/) do url = "#{$custom_download_endpoint}/rhn/manager/download/fake-rpm-suse-channel/repodata/repomd.xml" - $server.run("curl --ipv4 --location #{url} --output /dev/null") + get_target('server').run("curl --ipv4 --location #{url} --output /dev/null") end Then(/^it should be possible to reach the build sources$/) do - if $product == 'Uyuni' + if product == 'Uyuni' # TODO: move that internal resource to some other external location log 'Sanity check not implemented, move resource to external network first' else url = 'http://download.suse.de/ibs/SUSE/Products/SLE-SERVER/12-SP4/x86_64/product/media.1/products.key' - $server.run("curl --insecure --location #{url} --output /dev/null") + get_target('server').run("curl --insecure --location #{url} --output /dev/null") end end @@ -99,20 +99,20 @@ url = git_profiles.sub(/github\.com/, "raw.githubusercontent.com") .sub(/\.git#:/, "/master/") .sub(/$/, "/Docker/Dockerfile") - $server.run("curl --insecure --location #{url} --output /dev/null") + get_target('server').run("curl --insecure --location #{url} --output /dev/null") end Then(/^it should be possible to reach the authenticated registry$/) do unless $auth_registry.nil? || $auth_registry.empty? url = "https://#{$auth_registry}" - $server.run("curl --insecure --location #{url} --output /dev/null") + get_target('server').run("curl --insecure --location #{url} --output /dev/null") end end Then(/^it should be possible to reach the not authenticated registry$/) do unless $no_auth_registry.nil? || $no_auth_registry.empty? url = "https://#{$no_auth_registry}" - $server.run("curl --insecure --location #{url} --output /dev/null") + get_target('server').run("curl --insecure --location #{url} --output /dev/null") end end @@ -121,26 +121,26 @@ When(/^I delete these channels with spacewalk\-remove\-channel:$/) do |table| channels_cmd = "spacewalk-remove-channel " table.raw.each { |x| channels_cmd = channels_cmd + " -c " + x[0] } - $command_output, return_code = $server.run(channels_cmd, check_errors: false) + $command_output, return_code = get_target('server').run(channels_cmd, check_errors: false) end When(/^I list channels with spacewalk\-remove\-channel$/) do - $command_output, return_code = $server.run("spacewalk-remove-channel -l") + $command_output, return_code = get_target('server').run("spacewalk-remove-channel -l") raise "Unable to run spacewalk-remove-channel -l command on server" unless return_code.zero? end When(/^I add "([^"]*)" channel$/) do |channel| - $server.run("echo -e \"admin\nadmin\n\" | mgr-sync add channel #{channel}", buffer_size: 1_000_000) + get_target('server').run("echo -e \"admin\nadmin\n\" | mgr-sync add channel #{channel}", buffer_size: 1_000_000) end When(/^I use spacewalk\-common\-channel to add channel "([^"]*)" with arch "([^"]*)"$/) do |child_channel, arch| command = "spacewalk-common-channels -u admin -p admin -a #{arch} #{child_channel}" - $command_output, _code = $server.run(command) + $command_output, _code = get_target('server').run(command) end When(/^I use spacewalk\-repo\-sync to sync channel "([^"]*)"$/) do |channel| command = "spacewalk-repo-sync -c #{channel}" - $command_output, _code = $server.run(command) + $command_output, _code = get_target('server').run(command) end Then(/^I should get "([^"]*)"$/) do |value| @@ -169,7 +169,7 @@ end When(/^I wait for "([^"]*)" to be (uninstalled|installed) on "([^"]*)"$/) do |package, status, host| - if package.include?("suma") && $product == "Uyuni" + if package.include?("suma") && product == "Uyuni" package.gsub! "suma", "uyuni" end node = get_target(host) @@ -195,7 +195,7 @@ When(/^I query latest Salt changes on "(.*?)"$/) do |host| node = get_target(host) - salt = $use_salt_bundle ? "venv-salt-minion" : "salt" + salt = use_salt_bundle ? "venv-salt-minion" : "salt" if host == 'server' salt = 'salt' end @@ -209,12 +209,12 @@ When(/^I query latest Salt changes on Debian-like system "(.*?)"$/) do |host| node = get_target(host) salt = - if $use_salt_bundle + if use_salt_bundle "venv-salt-minion" else "salt" end - changelog_file = $use_salt_bundle ? "changelog.gz" : "changelog.Debian.gz" + changelog_file = use_salt_bundle ? "changelog.gz" : "changelog.Debian.gz" result, return_code = node.run("zcat /usr/share/doc/#{salt}/#{changelog_file}") result.split("\n")[0, 15].each do |line| line.force_encoding("UTF-8") @@ -245,7 +245,7 @@ elsif host.include? 'minion' or host.include? 'build' cmd = 'salt' end - $server.run_until_ok("#{cmd} #{system_name} state.highstate") + get_target('server').run_until_ok("#{cmd} #{system_name} state.highstate") end When(/^I wait until "([^"]*)" service is active on "([^"]*)"$/) do |service, host| @@ -269,7 +269,7 @@ end When(/^I enable product "([^"]*)"$/) do |prd| - list_output, _code = $server.run("mgr-sync list products", check_errors: false, buffer_size: 1_000_000) + list_output, _code = get_target('server').run("mgr-sync list products", check_errors: false, buffer_size: 1_000_000) executed = false linenum = 0 list_output.each_line do |line| @@ -277,14 +277,14 @@ linenum += 1 next unless line.include? prd executed = true - $command_output, _code = $server.run("echo '#{linenum}' | mgr-sync add product", check_errors: false, buffer_size: 1_000_000) + $command_output, _code = get_target('server').run("echo '#{linenum}' | mgr-sync add product", check_errors: false, buffer_size: 1_000_000) break end raise $command_output.to_s unless executed end When(/^I enable product "([^"]*)" without recommended$/) do |prd| - list_output, _code = $server.run("mgr-sync list products", check_errors: false, buffer_size: 1_000_000) + list_output, _code = get_target('server').run("mgr-sync list products", check_errors: false, buffer_size: 1_000_000) executed = false linenum = 0 list_output.each_line do |line| @@ -292,31 +292,31 @@ linenum += 1 next unless line.include? prd executed = true - $command_output, _code = $server.run("echo '#{linenum}' | mgr-sync add product --no-recommends", check_errors: false, buffer_size: 1_000_000) + $command_output, _code = get_target('server').run("echo '#{linenum}' | mgr-sync add product --no-recommends", check_errors: false, buffer_size: 1_000_000) break end raise $command_output.to_s unless executed end When(/^I execute mgr\-sync "([^"]*)" with user "([^"]*)" and password "([^"]*)"$/) do |arg1, u, p| - $command_output, _code = $server.run("echo -e '#{u}\n#{p}\n' | mgr-sync #{arg1}", check_errors: false, buffer_size: 1_000_000) + $command_output, _code = get_target('server').run("echo -e '#{u}\n#{p}\n' | mgr-sync #{arg1}", check_errors: false, buffer_size: 1_000_000) end When(/^I execute mgr\-sync "([^"]*)"$/) do |arg1| - $command_output, _code = $server.run("mgr-sync #{arg1}", buffer_size: 1_000_000) + $command_output, _code = get_target('server').run("mgr-sync #{arg1}", buffer_size: 1_000_000) end When(/^I remove the mgr\-sync cache file$/) do - $command_output, _code = $server.run('rm -f ~/.mgr-sync') + $command_output, _code = get_target('server').run('rm -f ~/.mgr-sync') end When(/^I refresh SCC$/) do refresh_timeout = 600 - $server.run('echo -e "admin\nadmin\n" | mgr-sync refresh', timeout: refresh_timeout) + get_target('server').run('echo -e "admin\nadmin\n" | mgr-sync refresh', timeout: refresh_timeout) end When(/^I execute mgr\-sync refresh$/) do - $command_output, _code = $server.run('mgr-sync refresh', check_errors: false) + $command_output, _code = get_target('server').run('mgr-sync refresh', check_errors: false) end # This function waits for all the reposyncs to complete. @@ -327,7 +327,7 @@ reposync_not_running_streak = 0 reposync_left_running_streak = 0 while reposync_not_running_streak <= 60 - command_output, _code = $server.run('ps axo pid,cmd | grep spacewalk-repo-sync | grep -v grep', check_errors: false) + command_output, _code = get_target('server').run('ps axo pid,cmd | grep spacewalk-repo-sync | grep -v grep', check_errors: false) if command_output.empty? reposync_not_running_streak += 1 reposync_left_running_streak = 0 @@ -354,7 +354,7 @@ reposync_not_running_streak = 0 reposync_left_running_streak = 0 while reposync_not_running_streak <= 60 - command_output, _code = $server.run('ps axo pid,cmd | grep spacewalk-repo-sync | grep -v grep', check_errors: false) + command_output, _code = get_target('server').run('ps axo pid,cmd | grep spacewalk-repo-sync | grep -v grep', check_errors: false) if command_output.empty? reposync_not_running_streak += 1 reposync_left_running_streak = 0 @@ -377,34 +377,34 @@ reposync_left_running_streak = 0 pid = process.split(' ')[0] - $server.run("kill #{pid}", check_errors: false) + get_target('server').run("kill #{pid}", check_errors: false) log "Reposync of channel #{channel} killed" end end Then(/^the reposync logs should not report errors$/) do - result, code = $server.run('grep -i "ERROR:" /var/log/rhn/reposync/*.log', check_errors: false) + result, code = get_target('server').run('grep -i "ERROR:" /var/log/rhn/reposync/*.log', check_errors: false) raise "Errors during reposync:\n#{result}" if code.zero? end Then(/^the "([^"]*)" reposync logs should not report errors$/) do |list| logfiles = list.split(",") logfiles.each do |logs| - _result, code = $server.run("test -f /var/log/rhn/reposync/#{logs}.log", check_errors: false) + _result, code = get_target('server').run("test -f /var/log/rhn/reposync/#{logs}.log", check_errors: false) if code.zero? - result, code = $server.run("grep -i 'ERROR:' /var/log/rhn/reposync/#{logs}.log", check_errors: false) + result, code = get_target('server').run("grep -i 'ERROR:' /var/log/rhn/reposync/#{logs}.log", check_errors: false) raise "Errors during #{logs} reposync:\n#{result}" if code.zero? end end end Then(/^"([^"]*)" package should have been stored$/) do |pkg| - $server.run("find /var/spacewalk/packages -name #{pkg}") + get_target('server').run("find /var/spacewalk/packages -name #{pkg}") end Then(/^solver file for "([^"]*)" should reference "([^"]*)"$/) do |channel, pkg| repeat_until_timeout(timeout: 600, message: "Reference #{pkg} not found in file.") do - _result, code = $server.run("dumpsolv /var/cache/rhn/repodata/#{channel}/solv | grep #{pkg}", check_errors: false) + _result, code = get_target('server').run("dumpsolv /var/cache/rhn/repodata/#{channel}/solv | grep #{pkg}", check_errors: false) break if code.zero? end end @@ -414,22 +414,22 @@ repeat_until_timeout(timeout: 7200, message: 'Channel not fully synced') do # solv is the last file to be written when the server synchronizes a channel, # therefore we wait until it exist - _result, code = $server.run("test -f /var/cache/rhn/repodata/#{channel}/solv", check_errors: false) + _result, code = get_target('server').run("test -f /var/cache/rhn/repodata/#{channel}/solv", check_errors: false) if code.zero? # We want to check if no .new files exists. # On a re-sync, the old files stay, the new one have this suffix until it's ready. - _result, new_code = $server.run("test -f /var/cache/rhn/repodata/#{channel}/solv.new", check_errors: false) + _result, new_code = get_target('server').run("test -f /var/cache/rhn/repodata/#{channel}/solv.new", check_errors: false) unless new_code.zero? break if withpkg.empty? - _result, solv_code = $server.run("dumpsolv /var/cache/rhn/repodata/#{channel}/solv | grep 'repo size: 0 solvables'", check_errors: false) + _result, solv_code = get_target('server').run("dumpsolv /var/cache/rhn/repodata/#{channel}/solv | grep 'repo size: 0 solvables'", check_errors: false) break unless solv_code.zero? end else # maybe a debian repo? - _result, code = $server.run("test -f /var/cache/rhn/repodata/#{channel}/Release", check_errors: false) + _result, code = get_target('server').run("test -f /var/cache/rhn/repodata/#{channel}/Release", check_errors: false) if code.zero? break if withpkg.empty? - _result, solv_code = $server.run("test -s /var/cache/rhn/repodata/#{channel}/Packages", check_errors: false) + _result, solv_code = get_target('server').run("test -s /var/cache/rhn/repodata/#{channel}/Packages", check_errors: false) break if solv_code.zero? end end @@ -449,17 +449,17 @@ end When(/^I execute mgr\-bootstrap "([^"]*)"$/) do |arg1| - $command_output, _code = $server.run("mgr-bootstrap #{arg1}") + $command_output, _code = get_target('server').run("mgr-bootstrap #{arg1}") end When(/^I fetch "([^"]*)" to "([^"]*)"$/) do |file, host| node = get_target(host) - node.run("wget http://#{$server.full_hostname}/#{file}") + node.run("wget http://#{get_target('server').full_hostname}/#{file}") end When(/^I wait until file "([^"]*)" contains "([^"]*)" on server$/) do |file, content| repeat_until_timeout(message: "#{content} not found in file #{file}", report_result: true) do - output, _code = $server.run("grep #{content} #{file}", check_errors: false) + output, _code = get_target('server').run("grep #{content} #{file}", check_errors: false) break if output =~ /#{content}/ sleep 2 "\n-----\n#{output}\n-----\n" @@ -467,13 +467,13 @@ end Then(/^file "([^"]*)" should contain "([^"]*)" on server$/) do |file, content| - output, _code = $server.run("grep -F '#{content}' #{file}", check_errors: false) + output, _code = get_target('server').run("grep -F '#{content}' #{file}", check_errors: false) raise "'#{content}' not found in file #{file}" if output !~ /#{content}/ "\n-----\n#{output}\n-----\n" end Then(/^the tomcat logs should not contain errors$/) do - output, _code = $server.run('cat /var/log/tomcat/*') + output, _code = get_target('server').run('cat /var/log/tomcat/*') msgs = %w[ERROR NullPointer] msgs.each do |msg| raise "-#{msg}- msg found on tomcat logs" if output.include? msg @@ -481,7 +481,7 @@ end Then(/^the taskomatic logs should not contain errors$/) do - output, _code = $server.run('cat /var/log/rhn/rhn_taskomatic_daemon.log') + output, _code = get_target('server').run('cat /var/log/rhn/rhn_taskomatic_daemon.log') msgs = %w[NullPointer] msgs.each do |msg| raise "-#{msg}- msg found on taskomatic logs" if output.include? msg @@ -489,28 +489,28 @@ end Then(/^the log messages should not contain out of memory errors$/) do - output, code = $server.run('grep -i "Out of memory: Killed process" /var/log/messages', check_errors: false) + output, code = get_target('server').run('grep -i "Out of memory: Killed process" /var/log/messages', check_errors: false) raise "Out of memory errors in /var/log/messages:\n#{output}" if code.zero? end When(/^I restart the spacewalk service$/) do - $server.run('spacewalk-service restart') + get_target('server').run('spacewalk-service restart') end When(/^I shutdown the spacewalk service$/) do - $server.run('spacewalk-service stop') + get_target('server').run('spacewalk-service stop') end When(/^I execute spacewalk-debug on the server$/) do - $server.run('spacewalk-debug') - code = file_extract($server, "/tmp/spacewalk-debug.tar.bz2", "spacewalk-debug.tar.bz2") + get_target('server').run('spacewalk-debug') + code = file_extract(get_target('server'), "/tmp/spacewalk-debug.tar.bz2", "spacewalk-debug.tar.bz2") raise "Download debug file failed" unless code.zero? end When(/^I extract the log files from all our active nodes$/) do $nodes.each do |node| # the salt_migration_minion is not available anymore - next if node.nil? || node == $salt_migration_minion + next if node.nil? || node == get_target('salt_migration_minion') STDOUT.puts "Node: #{node.full_hostname}" extract_logs_from_node(node) @@ -527,7 +527,7 @@ base_url = base_url.strip.split('=')[1].delete '"' real_uri = URI.parse(base_url) log 'Real protocol: ' + real_uri.scheme + ' host: ' + real_uri.host + ' port: ' + real_uri.port.to_s - normal_download_endpoint = "https://#{$proxy.full_hostname}:443" + normal_download_endpoint = "https://#{get_target('proxy').full_hostname}:443" expected_uri = URI.parse(type == 'custom' ? $custom_download_endpoint : normal_download_endpoint) log 'Expected protocol: ' + expected_uri.scheme + ' host: ' + expected_uri.host + ' port: ' + expected_uri.port.to_s raise 'Some parameters are not as expected' unless real_uri.scheme == expected_uri.scheme && real_uri.host == expected_uri.host && real_uri.port == expected_uri.port @@ -560,38 +560,38 @@ %w[ipmisim1.emu lan.conf fake_ipmi_host.sh].each do |file| source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/etc/ipmi/' + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? end - $server.run('chmod +x /etc/ipmi/fake_ipmi_host.sh') - $server.run('ipmi_sim -n < /dev/null > /dev/null &') + get_target('server').run('chmod +x /etc/ipmi/fake_ipmi_host.sh') + get_target('server').run('ipmi_sim -n < /dev/null > /dev/null &') end When(/^the server stops mocking an IPMI host$/) do - $server.run('pkill ipmi_sim') - $server.run('pkill fake_ipmi_host.sh || :') + get_target('server').run('pkill ipmi_sim') + get_target('server').run('pkill fake_ipmi_host.sh || :') end When(/^the server starts mocking a Redfish host$/) do - $server.run('mkdir -p /root/Redfish-Mockup-Server/') + get_target('server').run('mkdir -p /root/Redfish-Mockup-Server/') %w[redfishMockupServer.py rfSsdpServer.py].each do |file| source = File.dirname(__FILE__) + '/../upload_files/Redfish-Mockup-Server/' + file dest = '/root/Redfish-Mockup-Server/' + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? end - $server.run('curl --output DSP2043_2019.1.zip https://www.dmtf.org/sites/default/files/standards/documents/DSP2043_2019.1.zip') - $server.run('unzip DSP2043_2019.1.zip') + get_target('server').run('curl --output DSP2043_2019.1.zip https://www.dmtf.org/sites/default/files/standards/documents/DSP2043_2019.1.zip') + get_target('server').run('unzip DSP2043_2019.1.zip') cmd = "/usr/bin/python3 /root/Redfish-Mockup-Server/redfishMockupServer.py " \ - "-H #{$server.full_hostname} -p 8443 " \ + "-H #{get_target('server').full_hostname} -p 8443 " \ "-S -D /root/DSP2043_2019.1/public-catfish/ " \ "--ssl --cert /etc/pki/tls/certs/spacewalk.crt --key /etc/pki/tls/private/spacewalk.key " \ "< /dev/null > /dev/null 2>&1 &" - $server.run(cmd) + get_target('server').run(cmd) end When(/^the server stops mocking a Redfish host$/) do - $server.run('pkill -e -f /root/Redfish-Mockup-Server/redfishMockupServer.py') + get_target('server').run('pkill -e -f /root/Redfish-Mockup-Server/redfishMockupServer.py') end When(/^I install a user-defined state for "([^"]*)" on the server$/) do |host| @@ -600,22 +600,22 @@ file = 'user_defined_state.sls' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = "/srv/salt/" + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? # generate top file and copy it to server script = "base:\n" \ " '#{system_name}':\n" \ " - user_defined_state\n" path = generate_temp_file('top.sls', script) - return_code = file_inject($server, path, '/srv/salt/top.sls') + return_code = file_inject(get_target('server'), path, '/srv/salt/top.sls') raise 'File injection failed' unless return_code.zero? `rm #{path}` # make both files readeable by salt - $server.run('chgrp salt /srv/salt/*') + get_target('server').run('chgrp salt /srv/salt/*') end When(/^I uninstall the user-defined state from the server$/) do - $server.run('rm /srv/salt/{user_defined_state.sls,top.sls}') + get_target('server').run('rm /srv/salt/{user_defined_state.sls,top.sls}') end When(/^I uninstall the managed file from "([^"]*)"$/) do |host| @@ -628,12 +628,12 @@ case host when 'server' - $server.run("configure-tftpsync.sh #{ENV['PROXY']}") + get_target('server').run("configure-tftpsync.sh #{ENV['PROXY']}") when 'proxy' cmd = "configure-tftpsync.sh --non-interactive --tftpbootdir=/srv/tftpboot \ --server-fqdn=#{ENV['SERVER']} \ --proxy-fqdn='proxy.example.org'" - $proxy.run(cmd) + get_target('proxy').run(cmd) else log "Host #{host} not supported" end @@ -656,7 +656,7 @@ end When(/^I clean the search index on the server$/) do - output, _code = $server.run('/usr/sbin/rhn-search cleanindex', check_errors: false) + output, _code = get_target('server').run('/usr/sbin/rhn-search cleanindex', check_errors: false) log 'Search reindex finished.' if output.include?('Index files have been deleted and database has been cleaned up, ready to reindex') raise 'The output includes an error log' if output.include?('ERROR') step %(I wait until rhn-search is responding) @@ -666,10 +666,10 @@ step %(I wait until "rhn-search" service is active on "server") repeat_until_timeout(timeout: 60, message: 'rhn-search is not responding properly.') do begin - log "Search by hostname: #{$minion.hostname}" - result = $api_test.system.search.hostname($minion.hostname) + log "Search by hostname: #{get_target('sle_minion').hostname}" + result = $api_test.system.search.hostname(get_target('sle_minion').hostname) log result - break if $minion.full_hostname.include? result.first['hostname'] + break if get_target('sle_minion').full_hostname.include? result.first['hostname'] rescue StandardError => e log "rhn-search still not responding.\nError message: #{e.message}" sleep 3 @@ -681,7 +681,7 @@ # mgr-sync refresh is a slow operation, we don't use the default timeout cmd = "spacecmd -u admin -p admin api sync.content.listProducts" repeat_until_timeout(timeout: 1800, message: "'mgr-sync refresh' did not finish") do - result, code = $server.run(cmd, check_errors: false) + result, code = get_target('server').run(cmd, check_errors: false) break if result.include? "SLES" sleep 5 end @@ -758,7 +758,7 @@ When(/^I wait until file "(.*)" exists on server$/) do |file| repeat_until_timeout do - break if file_exists?($server, file) + break if file_exists?(get_target('server'), file) sleep(1) end end @@ -771,11 +771,11 @@ end When(/^I call spacewalk\-repo\-sync for channel "(.*?)" with a custom url "(.*?)"$/) do |arg1, arg2| - @command_output, _code = $server.run("spacewalk-repo-sync -c #{arg1} -u #{arg2}", check_errors: false) + @command_output, _code = get_target('server').run("spacewalk-repo-sync -c #{arg1} -u #{arg2}", check_errors: false) end When(/^I call spacewalk\-repo\-sync to sync the channel "(.*?)"$/) do |channel| - @command_output, _code = $server.run("spacewalk-repo-sync -c #{channel}", check_errors: false) + @command_output, _code = get_target('server').run("spacewalk-repo-sync -c #{channel}", check_errors: false) end When(/^I call spacewalk\-repo\-sync to sync the parent channel "(.*?)"$/) do |channel| @@ -783,13 +783,13 @@ end When(/^I get "(.*?)" file details for channel "(.*?)" via spacecmd$/) do |arg1, arg2| - @command_output, _code = $server.run("spacecmd -u admin -p admin -q -- configchannel_filedetails #{arg2} '#{arg1}'", check_errors: false) + @command_output, _code = get_target('server').run("spacecmd -u admin -p admin -q -- configchannel_filedetails #{arg2} '#{arg1}'", check_errors: false) end # Repositories and packages management When(/^I migrate the non-SUMA repositories on "([^"]*)"$/) do |host| node = get_target(host) - salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" + salt_call = use_salt_bundle ? "venv-salt-call" : "salt-call" # use sumaform states to migrate to latest SP the system repositories: node.run("#{salt_call} --local --file-root /root/salt/ state.apply repos") # disable again the non-SUMA repositories: @@ -839,16 +839,16 @@ When(/^I enable source package syncing$/) do cmd = "echo 'server.sync_source_packages = 1' >> /etc/rhn/rhn.conf" - $server.run(cmd) + get_target('server').run(cmd) end When(/^I disable source package syncing$/) do cmd = "sed -i 's/^server.sync_source_packages = 1.*//g' /etc/rhn/rhn.conf" - $server.run(cmd) + get_target('server').run(cmd) end When(/^I install pattern "([^"]*)" on this "([^"]*)"$/) do |pattern, host| - if pattern.include?("suma") && $product == "Uyuni" + if pattern.include?("suma") && product == "Uyuni" pattern.gsub! "suma", "uyuni" end node = get_target(host) @@ -858,7 +858,7 @@ end When(/^I remove pattern "([^"]*)" from this "([^"]*)"$/) do |pattern, host| - if pattern.include?("suma") && $product == "Uyuni" + if pattern.include?("suma") && product == "Uyuni" pattern.gsub! "suma", "uyuni" end node = get_target(host) @@ -940,16 +940,16 @@ end When(/^I install package tftpboot-installation on the server$/) do - output, _code = $server.run('find /var/spacewalk/packages -name tftpboot-installation-SLE-15-SP4-x86_64-*.noarch.rpm') + output, _code = get_target('server').run('find /var/spacewalk/packages -name tftpboot-installation-SLE-15-SP4-x86_64-*.noarch.rpm') packages = output.split("\n") pattern = '/tftpboot-installation-([^/]+)*.noarch.rpm' # Reverse sort the package name to get the latest version first and install it package = packages.min { |a, b| b.match(pattern)[0] <=> a.match(pattern)[0] } - $server.run("rpm -i #{package}", check_errors: false) + get_target('server').run("rpm -i #{package}", check_errors: false) end When(/^I reset tftp defaults on the proxy$/) do - $proxy.run("echo 'TFTP_USER=\"tftp\"\nTFTP_OPTIONS=\"\"\nTFTP_DIRECTORY=\"/srv/tftpboot\"\n' > /etc/sysconfig/tftp") + get_target('proxy').run("echo 'TFTP_USER=\"tftp\"\nTFTP_OPTIONS=\"\"\nTFTP_DIRECTORY=\"/srv/tftpboot\"\n' > /etc/sysconfig/tftp") end When(/^I wait until the package "(.*?)" has been cached on this "(.*?)"$/) do |pkg_name, host| @@ -969,7 +969,7 @@ base_channel = BASE_CHANNEL_BY_CLIENT[host] channel = CHANNEL_TO_SYNC_BY_BASE_CHANNEL[base_channel] parent_channel = PARENT_CHANNEL_TO_SYNC_BY_BASE_CHANNEL[base_channel] - $server.wait_while_process_running('mgr-create-bootstrap-repo') + get_target('server').wait_while_process_running('mgr-create-bootstrap-repo') cmd = if parent_channel.nil? "mgr-create-bootstrap-repo --create #{channel} --with-custom-channels --flush" else @@ -977,47 +977,47 @@ end log 'Creating the boostrap repository on the server:' log ' ' + cmd - $server.run(cmd) + get_target('server').run(cmd) end When(/^I install "([^"]*)" product on the proxy$/) do |product| - out, = $proxy.run("zypper ref && zypper --non-interactive install --auto-agree-with-licenses --force-resolution -t product #{product}") + out, = get_target('proxy').run("zypper ref && zypper --non-interactive install --auto-agree-with-licenses --force-resolution -t product #{product}") log "Installed #{product} product: #{out}" end When(/^I install proxy pattern on the proxy$/) do - pattern = $product == 'Uyuni' ? 'uyuni_proxy' : 'suma_proxy' + pattern = product == 'Uyuni' ? 'uyuni_proxy' : 'suma_proxy' cmd = "zypper --non-interactive install -t pattern #{pattern}" - $proxy.run(cmd, timeout: 600, successcodes: [0, 100, 101, 102, 103, 106]) + get_target('proxy').run(cmd, timeout: 600, successcodes: [0, 100, 101, 102, 103, 106]) end When(/^I let squid use avahi on the proxy$/) do file = '/usr/share/rhn/proxy-template/squid.conf' key = 'dns_multicast_local' val = 'on' - $proxy.run("grep '^#{key}' #{file} && sed -i -e 's/^#{key}.*$/#{key} #{val}/' #{file} || echo '#{key} #{val}' >> #{file}") + get_target('proxy').run("grep '^#{key}' #{file} && sed -i -e 's/^#{key}.*$/#{key} #{val}/' #{file} || echo '#{key} #{val}' >> #{file}") key = 'ignore_unknown_nameservers' val = 'off' - $proxy.run("grep '^#{key}' #{file} && sed -i -e 's/^#{key}.*$/#{key} #{val}/' #{file} || echo '#{key} #{val}' >> #{file}") + get_target('proxy').run("grep '^#{key}' #{file} && sed -i -e 's/^#{key}.*$/#{key} #{val}/' #{file} || echo '#{key} #{val}' >> #{file}") end When(/^I open avahi port on the proxy$/) do - $proxy.run('firewall-offline-cmd --zone=public --add-service=mdns') + get_target('proxy').run('firewall-offline-cmd --zone=public --add-service=mdns') end When(/^I copy server\'s keys to the proxy$/) do %w[RHN-ORG-PRIVATE-SSL-KEY RHN-ORG-TRUSTED-SSL-CERT rhn-ca-openssl.cnf].each do |file| - return_code = file_extract($server, '/root/ssl-build/' + file, '/tmp/' + file) + return_code = file_extract(get_target('server'), '/root/ssl-build/' + file, '/tmp/' + file) raise 'File extraction failed' unless return_code.zero? - $proxy.run('mkdir -p /root/ssl-build') - return_code = file_inject($proxy, '/tmp/' + file, '/root/ssl-build/' + file) + get_target('proxy').run('mkdir -p /root/ssl-build') + return_code = file_inject(get_target('proxy'), '/tmp/' + file, '/root/ssl-build/' + file) raise 'File injection failed' unless return_code.zero? end end When(/^I configure the proxy$/) do # prepare the settings file - settings = "RHN_PARENT=#{$server.full_hostname}\n" \ + settings = "RHN_PARENT=#{get_target('server').full_hostname}\n" \ "HTTP_PROXY=''\n" \ "VERSION=''\n" \ "TRACEBACK_EMAIL=galaxy-noise@suse.de\n" \ @@ -1026,7 +1026,7 @@ "SSL_PASSWORD=spacewalk\n" \ "SSL_ORG=SUSE\n" \ "SSL_ORGUNIT=SUSE\n" \ - "SSL_COMMON=#{$proxy.full_hostname}\n" \ + "SSL_COMMON=#{get_target('proxy').full_hostname}\n" \ "SSL_CITY=Nuremberg\n" \ "SSL_STATE=Bayern\n" \ "SSL_COUNTRY=DE\n" \ @@ -1042,62 +1042,62 @@ filename = File.basename(path) cmd = "configure-proxy.sh --non-interactive --rhn-user=admin --rhn-password=admin --answer-file=#{filename}" proxy_timeout = 600 - $proxy.run(cmd, timeout: proxy_timeout) + get_target('proxy').run(cmd, timeout: proxy_timeout) end When(/^I allow all SSL protocols on the proxy's apache$/) do file = '/etc/apache2/ssl-global.conf' key = 'SSLProtocol' val = 'all -SSLv2 -SSLv3' - $proxy.run("grep '#{key}' #{file} && sed -i -e 's/#{key}.*$/#{key} #{val}/' #{file}") - $proxy.run("systemctl reload apache2.service") + get_target('proxy').run("grep '#{key}' #{file} && sed -i -e 's/#{key}.*$/#{key} #{val}/' #{file}") + get_target('proxy').run("systemctl reload apache2.service") end When(/^I restart squid service on the proxy$/) do # We need to restart squid when we add a CNAME to the certificate - $proxy.run("systemctl restart squid.service") + get_target('proxy').run("systemctl restart squid.service") end When(/^I create channel "([^"]*)" from spacecmd of type "([^"]*)"$/) do |name, type| command = "spacecmd -u admin -p admin -- configchannel_create -n #{name} -t #{type}" - $server.run(command) + get_target('server').run(command) end When(/^I update init.sls from spacecmd with content "([^"]*)" for channel "([^"]*)"$/) do |content, label| filepath = "/tmp/#{label}" - $server.run("echo -e \"#{content}\" > #{filepath}", timeout: 600) + get_target('server').run("echo -e \"#{content}\" > #{filepath}", timeout: 600) command = "spacecmd -u admin -p admin -- configchannel_updateinitsls -c #{label} -f #{filepath} -y" - $server.run(command) - file_delete($server, filepath) + get_target('server').run(command) + file_delete(get_target('server'), filepath) end When(/^I update init.sls from spacecmd with content "([^"]*)" for channel "([^"]*)" and revision "([^"]*)"$/) do |content, label, revision| filepath = "/tmp/#{label}" - $server.run("echo -e \"#{content}\" > #{filepath}", timeout: 600) + get_target('server').run("echo -e \"#{content}\" > #{filepath}", timeout: 600) command = "spacecmd -u admin -p admin -- configchannel_updateinitsls -c #{label} -f #{filepath} -r #{revision} -y" - $server.run(command) - file_delete($server, filepath) + get_target('server').run(command) + file_delete(get_target('server'), filepath) end When(/^I schedule apply configchannels for "([^"]*)"$/) do |host| system_name = get_system_name(host) - $server.run('spacecmd -u admin -p admin clear_caches') + get_target('server').run('spacecmd -u admin -p admin clear_caches') command = "spacecmd -y -u admin -p admin -- system_scheduleapplyconfigchannels #{system_name}" - $server.run(command) + get_target('server').run(command) end # WORKAROUND # Work around issue https://github.com/SUSE/spacewalk/issues/10360 # Remove as soon as the issue is fixed When(/^I let Kiwi build from external repositories$/) do - $server.run("sed -i 's/--ignore-repos-used-for-build//' /usr/share/susemanager/salt/images/kiwi-image-build.sls") + get_target('server').run("sed -i 's/--ignore-repos-used-for-build//' /usr/share/susemanager/salt/images/kiwi-image-build.sls") end When(/^I refresh packages list via spacecmd on "([^"]*)"$/) do |client| node = get_system_name(client) - $server.run("spacecmd -u admin -p admin clear_caches") + get_target('server').run("spacecmd -u admin -p admin clear_caches") command = "spacecmd -u admin -p admin system_schedulepackagerefresh #{node}" - $server.run(command) + get_target('server').run(command) end When(/^I refresh the packages list via package manager on "([^"]*)"$/) do |host| @@ -1114,19 +1114,19 @@ current_time = Time.now.strftime('%Y%m%d%H%M') timeout_time = (Time.now + long_wait_delay + round_minute).strftime('%Y%m%d%H%M') node = get_system_name(client) - $server.run("spacecmd -u admin -p admin clear_caches") + get_target('server').run("spacecmd -u admin -p admin clear_caches") # Gather all the ids of package refreshes existing at SUMA - refreshes, = $server.run("spacecmd -u admin -p admin schedule_list | grep 'Package List Refresh' | cut -f1 -d' '", check_errors: false) + refreshes, = get_target('server').run("spacecmd -u admin -p admin schedule_list | grep 'Package List Refresh' | cut -f1 -d' '", check_errors: false) node_refreshes = "" refreshes.split(' ').each do |refresh_id| next unless refresh_id.match('/[0-9]{1,4}/') - refresh_result, = $server.run("spacecmd -u admin -p admin schedule_details #{refresh_id}") # Filter refreshes for specific system + refresh_result, = get_target('server').run("spacecmd -u admin -p admin schedule_details #{refresh_id}") # Filter refreshes for specific system next unless refresh_result.include? node node_refreshes += "^#{refresh_id}|" end cmd = "spacecmd -u admin -p admin schedule_list #{current_time} #{timeout_time} | egrep '#{node_refreshes.delete_suffix('|')}'" repeat_until_timeout(timeout: long_wait_delay, message: "'refresh package list' did not finish") do - result, code = $server.run(cmd, check_errors: false) + result, code = get_target('server').run(cmd, check_errors: false) sleep 1 next if result.include? '0 0 1' break if result.include? '1 0 0' @@ -1136,9 +1136,9 @@ When(/^spacecmd should show packages "([^"]*)" installed on "([^"]*)"$/) do |packages, client| node = get_system_name(client) - $server.run("spacecmd -u admin -p admin clear_caches") + get_target('server').run("spacecmd -u admin -p admin clear_caches") command = "spacecmd -u admin -p admin system_listinstalledpackages #{node}" - result, _code = $server.run(command, check_errors: false) + result, _code = get_target('server').run(command, check_errors: false) packages.split(' ').each do |package| pkg = package.strip raise "package #{pkg} is not installed" unless result.include? pkg @@ -1147,10 +1147,10 @@ When(/^I wait until package "([^"]*)" is installed on "([^"]*)" via spacecmd$/) do |pkg, client| node = get_system_name(client) - $server.run("spacecmd -u admin -p admin clear_caches") + get_target('server').run("spacecmd -u admin -p admin clear_caches") command = "spacecmd -u admin -p admin system_listinstalledpackages #{node}" repeat_until_timeout(timeout: 600, message: "package #{pkg} is not installed yet") do - result, _code = $server.run(command, check_errors: false) + result, _code = get_target('server').run(command, check_errors: false) break if result.include? pkg sleep 1 end @@ -1158,10 +1158,10 @@ When(/^I wait until package "([^"]*)" is removed from "([^"]*)" via spacecmd$/) do |pkg, client| node = get_system_name(client) - $server.run("spacecmd -u admin -p admin clear_caches") + get_target('server').run("spacecmd -u admin -p admin clear_caches") command = "spacecmd -u admin -p admin system_listinstalledpackages #{node}" repeat_until_timeout(timeout: 600, message: "package #{pkg} is still present") do - result, code = $server.run(command, check_errors: false) + result, code = get_target('server').run(command, check_errors: false) sleep 1 break unless result.include? pkg end @@ -1173,7 +1173,7 @@ os_family = node.os_family repositories = 'tools_pool_repo tools_update_repo' if os_family =~ /^opensuse/ || os_family =~ /^sles/ - if $product != 'Uyuni' + if product != 'Uyuni' repositories.concat(' tools_additional_repo') # Needed because in SLES15SP3 and openSUSE 15.3 and higher, firewalld will replace this package. # But the tools_update_repo's priority doesn't allow to cope with the obsoletes option from firewalld. @@ -1187,7 +1187,7 @@ When(/^I apply "([^"]*)" local salt state on "([^"]*)"$/) do |state, host| node = get_target(host) - salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" + salt_call = use_salt_bundle ? "venv-salt-call" : "salt-call" if host == 'server' salt_call = 'salt-call' end @@ -1200,30 +1200,30 @@ When(/^I copy unset package file on server$/) do base_dir = File.dirname(__FILE__) + "/../upload_files/unset_package/" - return_code = file_inject($server, base_dir + 'subscription-tools-1.0-0.noarch.rpm', '/root/subscription-tools-1.0-0.noarch.rpm') + return_code = file_inject(get_target('server'), base_dir + 'subscription-tools-1.0-0.noarch.rpm', '/root/subscription-tools-1.0-0.noarch.rpm') raise 'File injection failed' unless return_code.zero? end When(/^I copy vCenter configuration file on server$/) do base_dir = File.dirname(__FILE__) + "/../upload_files/virtualization/" - return_code = file_inject($server, base_dir + 'vCenter.json', '/var/tmp/vCenter.json') + return_code = file_inject(get_target('server'), base_dir + 'vCenter.json', '/var/tmp/vCenter.json') raise 'File injection failed' unless return_code.zero? end When(/^I export software channels "([^"]*)" with ISS v2 to "([^"]*)"$/) do |channel, path| - $server.run("inter-server-sync export --channels=#{channel} --outputDir=#{path}") + get_target('server').run("inter-server-sync export --channels=#{channel} --outputDir=#{path}") end When(/^I export config channels "([^"]*)" with ISS v2 to "([^"]*)"$/) do |channel, path| - $server.run("inter-server-sync export --configChannels=#{channel} --outputDir=#{path}") + get_target('server').run("inter-server-sync export --configChannels=#{channel} --outputDir=#{path}") end When(/^I import data with ISS v2 from "([^"]*)"$/) do |path| - $server.run("inter-server-sync import --importDir=#{path}") + get_target('server').run("inter-server-sync import --importDir=#{path}") end Then(/^"(.*?)" folder on server is ISS v2 export directory$/) do |folder| - raise "Folder #{folder} not found" unless file_exists?($server, folder + "/sql_statements.sql.gz") + raise "Folder #{folder} not found" unless file_exists?(get_target('server'), folder + "/sql_statements.sql.gz") end Then(/^export folder "(.*?)" shouldn't exist on "(.*?)"$/) do |folder, host| @@ -1240,12 +1240,12 @@ Given(/^I can connect to the ReportDB on the Server$/) do # connect and quit database - _result, return_code = $server.run(reportdb_server_query('\\q')) + _result, return_code = get_target('server').run(reportdb_server_query('\\q')) raise 'Couldn\'t connect to the ReportDB on the server' unless return_code.zero? end Given(/^I have a user with admin access to the ReportDB$/) do - users_and_permissions, return_code = $server.run(reportdb_server_query('\\du')) + users_and_permissions, return_code = get_target('server').run(reportdb_server_query('\\du')) raise 'Couldn\'t connect to the ReportDB on the server' unless return_code.zero? # extract only the line for the suma user suma_user_permissions = users_and_permissions[/pythia_susemanager(.*)}/] @@ -1258,13 +1258,13 @@ file = 'create_user_reportdb.exp' source = "#{File.dirname(__FILE__)}/../upload_files/#{file}" dest = "/tmp/#{file}" - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection in server failed' unless return_code.zero? - $server.run("expect -f /tmp/#{file} #{$reportdb_ro_user}") + get_target('server').run("expect -f /tmp/#{file} #{$reportdb_ro_user}") end Then(/^I should see the read-only user listed on the ReportDB user accounts$/) do - users_and_permissions, _code = $server.run(reportdb_server_query('\\du')) + users_and_permissions, _code = get_target('server').run(reportdb_server_query('\\du')) raise 'Couldn\'t find the newly created user on the ReportDB' unless users_and_permissions.include? $reportdb_ro_user end @@ -1272,19 +1272,19 @@ file = 'delete_user_reportdb.exp' source = "#{File.dirname(__FILE__)}/../upload_files/#{file}" dest = "/tmp/#{file}" - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection in server failed' unless return_code.zero? - $server.run("expect -f /tmp/#{file} #{$reportdb_ro_user}") + get_target('server').run("expect -f /tmp/#{file} #{$reportdb_ro_user}") end Then(/^I shouldn't see the read-only user listed on the ReportDB user accounts$/) do - users_and_permissions, _code = $server.run(reportdb_server_query('\\du')) + users_and_permissions, _code = get_target('server').run(reportdb_server_query('\\du')) raise 'Created read-only user on the ReportDB remains listed' if users_and_permissions.include? $reportdb_ro_user end When(/^I connect to the ReportDB with read-only user from external machine$/) do # connection from the controller to the reportdb in the server - $reportdb_ro_conn = PG.connect(host: $server.public_ip, port: 5432, dbname: 'reportdb', user: $reportdb_ro_user, password: 'linux') + $reportdb_ro_conn = PG.connect(host: get_target('server').public_ip, port: 5432, dbname: 'reportdb', user: $reportdb_ro_user, password: 'linux') end Then(/^I should be able to query the ReportDB$/) do @@ -1322,14 +1322,14 @@ Then(/^I should be able to connect to the ReportDB with the ReportDB admin user$/) do # connection from the controller to the reportdb in the server - reportdb_admin_conn = PG.connect(host: $server.public_ip, port: 5432, dbname: 'reportdb', user: $reportdb_admin_user, password: $reportdb_admin_password) + reportdb_admin_conn = PG.connect(host: get_target('server').public_ip, port: 5432, dbname: 'reportdb', user: $reportdb_admin_user, password: $reportdb_admin_password) raise 'Couldn\'t connect to ReportDB with admin from external machine' unless reportdb_admin_conn.status.zero? end Then(/^I should not be able to connect to product database with the ReportDB admin user$/) do - dbname = $product.delete(' ').downcase + dbname = product.delete(' ').downcase assert_raises PG::ConnectionBad do - PG.connect(host: $server.public_ip, port: 5432, dbname: dbname, user: $reportdb_admin_user, password: $reportdb_admin_password) + PG.connect(host: get_target('server').public_ip, port: 5432, dbname: dbname, user: $reportdb_admin_user, password: $reportdb_admin_password) end end @@ -1366,21 +1366,21 @@ When(/^I generate the configuration "([^"]*)" of Containerized Proxy on the server$/) do |file_path| # Doc: https://www.uyuni-project.org/uyuni-docs/en/uyuni/reference/spacecmd/proxy_container.html command = "echo spacewalk > cert_pass && spacecmd -u admin -p admin proxy_container_config_generate_cert" \ - " -- -o #{file_path} -p 8022 #{$proxy.full_hostname.sub('pxy', 'pod-pxy')} #{$server.full_hostname}" \ + " -- -o #{file_path} -p 8022 #{get_target('proxy').full_hostname.sub('pxy', 'pod-pxy')} #{get_target('server').full_hostname}" \ " 2048 galaxy-noise@suse.de --ca-pass cert_pass" \ " && rm cert_pass" - $server.run(command) + get_target('server').run(command) end When(/^I add avahi hosts in Containerized Proxy configuration$/) do - if $server.full_hostname.include? 'tf.local' + if get_target('server').full_hostname.include? 'tf.local' hosts_list = "" $host_by_node.each do |node, _host| hosts_list += "--add-host=#{node.full_hostname}:#{node.public_ip} " end hosts_list = escape_regex(hosts_list) regex = "s/^#?EXTRA_POD_ARGS=.*$/EXTRA_POD_ARGS=#{hosts_list}/g;" - $proxy.run("sed -i.bak -Ee '#{regex}' /etc/sysconfig/uyuni-proxy-systemd-services") + get_target('proxy').run("sed -i.bak -Ee '#{regex}' /etc/sysconfig/uyuni-proxy-systemd-services") log "Avahi hosts added: #{hosts_list}" log 'The Development team has not been working to support avahi in Containerized Proxy, yet. This is best effort.' else @@ -1400,7 +1400,7 @@ end Then(/^port "([^"]*)" should be (open|closed)$/) do |port, selection| - _output, code = $server.run("ss --listening --numeric | grep :#{port}", check_errors: false, verbose: true) + _output, code = get_target('server').run("ss --listening --numeric | grep :#{port}", check_errors: false, verbose: true) port_opened = code.zero? if selection == 'closed' raise "Port '#{port}' open although it should not be!" if port_opened @@ -1411,14 +1411,13 @@ # rebooting via SSH When(/^I reboot the server through SSH$/) do - init_string = "ssh:#{$server.public_ip}" + init_string = "ssh:#{get_target('server').public_ip}" temp_server = twopence_init(init_string) - temp_server.extend(LavandaBasic) temp_server.run('reboot > /dev/null 2> /dev/null &') default_timeout = 300 - check_shutdown($server.public_ip, default_timeout) - check_restart($server.public_ip, temp_server, default_timeout) + check_shutdown(get_target('server').public_ip, default_timeout) + check_restart(get_target('server').public_ip, temp_server, default_timeout) repeat_until_timeout(timeout: default_timeout, message: "Spacewalk didn't come up") do out, code = temp_server.run('spacewalk-service status', check_errors: false, timeout: 10) @@ -1435,7 +1434,7 @@ node.run('reboot > /dev/null 2> /dev/null &') reboot_timeout = 120 check_shutdown(node.public_ip, reboot_timeout) - check_restart($server.public_ip, node, reboot_timeout) + check_restart(get_target('server').public_ip, node, reboot_timeout) end When(/^I reboot the "([^"]*)" minion through the web UI$/) do |host| @@ -1458,21 +1457,20 @@ end When(/^I change the server's short hostname from hosts and hostname files$/) do - old_hostname = $server.hostname + old_hostname = get_target('server').hostname new_hostname = old_hostname + '2' log "New short hostname: #{new_hostname}" - $server.run("sed -i 's/#{old_hostname}/#{new_hostname}/g' /etc/hostname && - echo '#{$server.public_ip} #{$server.full_hostname} #{old_hostname}' >> /etc/hosts && - echo '#{$server.public_ip} #{new_hostname}#{$server.full_hostname.delete_prefix($server.hostname)} #{new_hostname}' >> /etc/hosts") + get_target('server').run("sed -i 's/#{old_hostname}/#{new_hostname}/g' /etc/hostname && + echo '#{get_target('server').public_ip} #{get_target('server').full_hostname} #{old_hostname}' >> /etc/hosts && + echo '#{get_target('server').public_ip} #{new_hostname}#{get_target('server').full_hostname.delete_prefix(get_target('server').hostname)} #{new_hostname}' >> /etc/hosts") end # changing hostname When(/^I run spacewalk-hostname-rename command on the server$/) do - temp_server = twopence_init("ssh:#{$server.public_ip}") - temp_server.extend(LavandaBasic) + temp_server = twopence_init("ssh:#{get_target('server').public_ip}") command = "spacecmd --nossl -q api api.getVersion -u admin -p admin; " \ - "spacewalk-hostname-rename #{$server.public_ip} " \ + "spacewalk-hostname-rename #{get_target('server').public_ip} " \ "--ssl-country=DE --ssl-state=Bayern --ssl-city=Nuremberg " \ "--ssl-org=SUSE --ssl-orgunit=SUSE --ssl-email=galaxy-noise@suse.de " \ "--ssl-ca-password=spacewalk" @@ -1493,15 +1491,14 @@ end When(/^I change back the server's hostname$/) do - init_string = "ssh:#{$server.public_ip}" + init_string = "ssh:#{get_target('server').public_ip}" temp_server = twopence_init(init_string) - temp_server.extend(LavandaBasic) - temp_server.run("echo '#{$server.full_hostname}' > /etc/hostname ") + temp_server.run("echo '#{get_target('server').full_hostname}' > /etc/hostname ") end When(/^I clean up the server's hosts file$/) do command = "sed -i '$d' /etc/hosts && sed -i '$d' /etc/hosts" - $server.run(command) + get_target('server').run(command) end When(/^I enable firewall ports for monitoring on this "([^"]*)"$/) do |host| @@ -1525,7 +1522,7 @@ When(/^I delete the system "([^"]*)" via spacecmd$/) do |minion| node = get_system_name(minion) command = "spacecmd -u admin -p admin -y system_delete #{node}" - $server.run(command, check_errors: true, verbose: true) + get_target('server').run(command, check_errors: true, verbose: true) end When(/^I execute "([^"]*)" on the "([^"]*)"$/) do |command, host| diff --git a/testsuite/features/step_definitions/common_steps.rb b/testsuite/features/step_definitions/common_steps.rb index 09a9f2678bb1..fa9536c0d05d 100644 --- a/testsuite/features/step_definitions/common_steps.rb +++ b/testsuite/features/step_definitions/common_steps.rb @@ -26,12 +26,12 @@ iso_path = url.sub(/^http:.*\/pub/, '/mirror/pub') else iso_path = "/tmp/#{name}.iso" - $server.run("wget --no-check-certificate -O #{iso_path} #{url}", timeout: 1500) + get_target('server').run("wget --no-check-certificate -O #{iso_path} #{url}", timeout: 1500) end mount_point = "/srv/www/htdocs/#{name}" - $server.run("mkdir -p #{mount_point}") - $server.run("grep #{iso_path} /etc/fstab || echo '#{iso_path} #{mount_point} iso9660 loop,ro,_netdev 0 0' >> /etc/fstab") - $server.run("umount #{iso_path}; mount #{iso_path}") + get_target('server').run("mkdir -p #{mount_point}") + get_target('server').run("grep #{iso_path} /etc/fstab || echo '#{iso_path} #{mount_point} iso9660 loop,ro,_netdev 0 0' >> /etc/fstab") + get_target('server').run("umount #{iso_path}; mount #{iso_path}") end Then(/^the hostname for "([^"]*)" should be correct$/) do |host| @@ -459,7 +459,7 @@ xml-commons-resolver xorriso xtables-plugins" - $build_host.run("zypper --non-interactive in #{packages}", timeout: 600) + get_target('build_host').run("zypper --non-interactive in #{packages}", timeout: 600) end # rubocop:enable Metrics/BlockLength @@ -504,14 +504,14 @@ end Given(/^metadata generation finished for "([^"]*)"$/) do |channel| - $server.run_until_ok("ls /var/cache/rhn/repodata/#{channel}/*updateinfo.xml.gz") + get_target('server').run_until_ok("ls /var/cache/rhn/repodata/#{channel}/*updateinfo.xml.gz") end When(/^I push package "([^"]*)" into "([^"]*)" channel$/) do |arg1, arg2| srvurl = "http://#{ENV['SERVER']}/APP" command = "rhnpush --server=#{srvurl} -u admin -p admin --nosig -c #{arg2} #{arg1} " - $server.run(command, timeout: 500) - $server.run('ls -lR /var/spacewalk/packages', timeout: 500) + get_target('server').run(command, timeout: 500) + get_target('server').run('ls -lR /var/spacewalk/packages', timeout: 500) end Then(/^I should see package "([^"]*)" in channel "([^"]*)"$/) do |pkg, channel| diff --git a/testsuite/features/step_definitions/content_lifecycle_steps.rb b/testsuite/features/step_definitions/content_lifecycle_steps.rb index f0eaecb4c6d2..662b5c8d7ab4 100644 --- a/testsuite/features/step_definitions/content_lifecycle_steps.rb +++ b/testsuite/features/step_definitions/content_lifecycle_steps.rb @@ -94,10 +94,10 @@ When(/^I add "([^\"]*)" calendar file as url$/) do |file| source = File.dirname(__FILE__) + '/../upload_files/' + file dest = "/srv/www/htdocs/pub/" + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? - $server.run("chmod 644 #{dest}") - url = "https://#{$server.full_hostname}/pub/" + file + get_target('server').run("chmod 644 #{dest}") + url = "https://#{get_target('server').full_hostname}/pub/" + file log "URL: #{url}" step %(I enter "#{url}" as "calendar-data-text") end diff --git a/testsuite/features/step_definitions/docker_steps.rb b/testsuite/features/step_definitions/docker_steps.rb index 845717ad656e..188676c3e4aa 100644 --- a/testsuite/features/step_definitions/docker_steps.rb +++ b/testsuite/features/step_definitions/docker_steps.rb @@ -12,9 +12,9 @@ def retrieve_build_host_id systems = $api_test.system.list_systems refute_nil(systems) build_host_id = systems - .select { |s| s['name'] == $build_host.full_hostname } + .select { |s| s['name'] == get_target('build_host').full_hostname } .map { |s| s['id'] }.first - refute_nil(build_host_id, "Build host #{$build_host.full_hostname} is not yet registered?") + refute_nil(build_host_id, "Build host #{get_target('build_host').full_hostname} is not yet registered?") build_host_id end diff --git a/testsuite/features/step_definitions/file_management_steps.rb b/testsuite/features/step_definitions/file_management_steps.rb index 8766a7110ea7..26dbac3217b5 100644 --- a/testsuite/features/step_definitions/file_management_steps.rb +++ b/testsuite/features/step_definitions/file_management_steps.rb @@ -6,7 +6,7 @@ # generic file management steps When(/^I destroy "([^"]*)" directory on server$/) do |directory| - $server.run("rm -rf #{directory}") + get_target('server').run("rm -rf #{directory}") end When(/^I destroy "([^"]*)" directory on "([^"]*)"$/) do |directory, host| @@ -20,7 +20,7 @@ end Then(/^file "([^"]*)" should exist on server$/) do |filename| - $server.run("test -f #{filename}") + get_target('server').run("test -f #{filename}") end Then(/^file "([^"]*)" should exist on "([^"]*)"$/) do |filename, host| @@ -34,7 +34,7 @@ end Then(/^file "([^"]*)" should not exist on server$/) do |filename| - $server.run("test ! -f #{filename}") + get_target('server').run("test ! -f #{filename}") end Then(/^file "([^"]*)" should not exist on "([^"]*)"$/) do |filename, host| @@ -49,14 +49,14 @@ When(/^I bootstrap "([^"]*)" using bootstrap script with activation key "([^"]*)" from the (server|proxy)$/) do |host, key, target_type| # Use server if proxy is not defined as proxy is not mandatory - target = $proxy - if target_type.include? 'server' or $proxy.nil? + target = get_target('proxy') + if target_type.include? 'server' or get_target('proxy').nil? log 'WARN: Bootstrapping to server, because proxy is not defined.' unless target_type.include? 'server' - target = $server + target = get_target('server') end # Prepare bootstrap script for different types of clients - force_bundle = $use_salt_bundle ? '--force-bundle' : '' + force_bundle = use_salt_bundle ? '--force-bundle' : '' node = get_target(host) gpg_keys = get_gpg_keys(node, target) @@ -94,5 +94,5 @@ Then(/^I remove server hostname from hosts file on "([^"]*)"$/) do |host| node = get_target(host) - node.run("sed -i \'s/#{$server.full_hostname}//\' /etc/hosts") + node.run("sed -i \'s/#{get_target('server').full_hostname}//\' /etc/hosts") end diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index 36758fc55337..c54027c376a2 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -1058,7 +1058,7 @@ end When(/^I enter the server hostname as the redfish server address$/) do - step %(I enter "#{$server.full_hostname}:8443" as "powerAddress") + step %(I enter "#{get_target('server').full_hostname}:8443" as "powerAddress") end When(/^I clear browser cookies$/) do diff --git a/testsuite/features/step_definitions/retail_steps.rb b/testsuite/features/step_definitions/retail_steps.rb index 2ef7db9b89e8..26711bceb2fa 100644 --- a/testsuite/features/step_definitions/retail_steps.rb +++ b/testsuite/features/step_definitions/retail_steps.rb @@ -46,7 +46,7 @@ def compute_kiwi_profile_filename(host) case image when 'sles15sp3', 'sles15sp3o', 'sles15sp4', 'sles15sp4o' # 'Kiwi/POS_Image-JeOS7_42' for 4.2 branch - $product == 'Uyuni' ? 'Kiwi/POS_Image-JeOS7_uyuni' : 'Kiwi/POS_Image-JeOS7_head' + product == 'Uyuni' ? 'Kiwi/POS_Image-JeOS7_uyuni' : 'Kiwi/POS_Image-JeOS7_head' when 'sles15sp2', 'sles15sp2o' 'Kiwi/POS_Image-JeOS7_41' when 'sles15sp1', 'sles15sp1o' @@ -64,7 +64,7 @@ def compute_kiwi_profile_name(host) case image when 'sles15sp3', 'sles15sp3o', 'sles15sp4', 'sles15sp4o' # 'POS_Image_JeOS7_42' for 4.2 branch - $product == 'Uyuni' ? 'POS_Image_JeOS7_uyuni' : 'POS_Image_JeOS7_head' + product == 'Uyuni' ? 'POS_Image_JeOS7_uyuni' : 'POS_Image_JeOS7_head' when 'sles15sp2', 'sles15sp2o' 'POS_Image_JeOS7_41' when 'sles15sp1', 'sles15sp1o' @@ -92,12 +92,12 @@ def compute_kiwi_profile_version(host) end When(/^I (enable|disable) repositories (before|after) installing branch server$/) do |action, _when| - os_version = $proxy.os_version - os_family = $proxy.os_family + os_version = get_target('proxy').os_version + os_family = get_target('proxy').os_family # Distribution repos = 'os_pool_repo os_update_repo testing_overlay_devel_repo' - log $proxy.run("zypper mr --#{action} #{repos}") + log get_target('proxy').run("zypper mr --#{action} #{repos}") # Server Applications, proxy product and modules, proxy devel if os_family =~ /^sles/ && os_version =~ /^15/ @@ -109,11 +109,11 @@ def compute_kiwi_profile_version(host) elsif os_family =~ /^opensuse/ repos = 'proxy_pool_repo' end - log $proxy.run("zypper mr --#{action} #{repos}") + log get_target('proxy').run("zypper mr --#{action} #{repos}") end When(/^I start tftp on the proxy$/) do - case $product + case product # TODO: Should we handle this in Sumaform? when 'Uyuni' step %(I enable repositories before installing branch server) @@ -121,22 +121,22 @@ def compute_kiwi_profile_version(host) 'zypper --non-interactive install tftp && ' \ 'systemctl enable tftp.service && ' \ 'systemctl start tftp.service' - $proxy.run(cmd) + get_target('proxy').run(cmd) step %(I disable repositories after installing branch server) else cmd = 'systemctl enable tftp.service && systemctl start tftp.service' - $proxy.run(cmd) + get_target('proxy').run(cmd) end end When(/^I stop tftp on the proxy$/) do - $proxy.run('systemctl stop tftp.service') + get_target('proxy').run('systemctl stop tftp.service') end When(/^I set up the private network on the terminals$/) do proxy = net_prefix + ADDRESSES['proxy'] # /etc/sysconfig/network/ifcfg-eth1 and /etc/resolv.conf - nodes = [$minion] + nodes = [get_target('sle_minion')] conf = "STARTMODE='auto'\\nBOOTPROTO='dhcp'" file = '/etc/sysconfig/network/ifcfg-eth1' script2 = "-e '/^#/d' -e 's/^search /search example.org /' -e '$anameserver #{proxy}' -e '/^nameserver /d'" @@ -146,7 +146,7 @@ def compute_kiwi_profile_version(host) node.run("echo -e \"#{conf}\" > #{file} && sed -i #{script2} #{file2} && ifup eth1") end # /etc/sysconfig/network-scripts/ifcfg-eth1 and /etc/sysconfig/network - nodes = [$rhlike_minion] + nodes = [get_target('rhlike_minion')] file = '/etc/sysconfig/network-scripts/ifcfg-eth1' conf2 = 'GATEWAYDEV=eth0' file2 = '/etc/sysconfig/network' @@ -163,7 +163,7 @@ def compute_kiwi_profile_version(host) node.run("echo -e \"#{conf}\" > #{file} && echo -e \"#{conf2}\" > #{file2} && systemctl restart #{service}") end # /etc/netplan/01-netcfg.yaml - nodes = [$deblike_minion] + nodes = [get_targer('deblike_minion')] source = File.dirname(__FILE__) + '/../upload_files/01-netcfg.yaml' dest = '/etc/netplan/01-netcfg.yaml' nodes.each do |node| @@ -212,11 +212,11 @@ def compute_kiwi_profile_version(host) file = 'restart-network-pxeboot.exp' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/tmp/' + file - return_code = file_inject($proxy, source, dest) + return_code = file_inject(get_target('proxy'), source, dest) raise 'File injection failed' unless return_code.zero? # We have no direct access to the PXE boot minion # so we run the command from the proxy - $proxy.run("expect -f /tmp/#{file} #{ipv6}") + get_target('proxy').run("expect -f /tmp/#{file} #{ipv6}") end When(/^I reboot the (Retail|Cobbler) terminal "([^"]*)"$/) do |context, host| @@ -236,19 +236,19 @@ def compute_kiwi_profile_version(host) file = 'reboot-pxeboot.exp' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/tmp/' + file - return_code = file_inject($proxy, source, dest) + return_code = file_inject(get_target('proxy'), source, dest) raise 'File injection failed' unless return_code.zero? - $proxy.run("expect -f /tmp/#{file} #{ipv6} #{context}") + get_target('proxy').run("expect -f /tmp/#{file} #{ipv6} #{context}") end When(/^I create bootstrap script for "([^"]+)" hostname and set the activation key "([^"]*)" in the bootstrap script on the proxy$/) do |host, key| # WORKAROUND: Revert once pxeboot autoinstallation contains venv-salt-minion - # force_bundle = $use_salt_bundle ? '--force-bundle' : '' - # $proxy.run("mgr-bootstrap #{force_bundle}") - $proxy.run("mgr-bootstrap --hostname=#{host}") + # force_bundle = use_salt_bundle ? '--force-bundle' : '' + # get_target('proxy').run("mgr-bootstrap #{force_bundle}") + get_target('proxy').run("mgr-bootstrap --hostname=#{host}") - $proxy.run("sed -i '/^ACTIVATION_KEYS=/c\\ACTIVATION_KEYS=#{key}' /srv/www/htdocs/pub/bootstrap/bootstrap.sh") - output, _code = $proxy.run('cat /srv/www/htdocs/pub/bootstrap/bootstrap.sh') + get_target('proxy').run("sed -i '/^ACTIVATION_KEYS=/c\\ACTIVATION_KEYS=#{key}' /srv/www/htdocs/pub/bootstrap/bootstrap.sh") + output, _code = get_target('proxy').run('cat /srv/www/htdocs/pub/bootstrap/bootstrap.sh') raise "Key: #{key} not included" unless output.include? key raise "Hostname: #{host} not included" unless output.include? host end @@ -257,44 +257,44 @@ def compute_kiwi_profile_version(host) file = 'bootstrap-pxeboot.exp' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/tmp/' + file - return_code = file_inject($proxy, source, dest) + return_code = file_inject(get_target('proxy'), source, dest) raise 'File injection failed' unless return_code.zero? ipv4 = net_prefix + ADDRESSES['pxeboot_minion'] - $proxy.run("expect -f /tmp/#{file} #{ipv4}", verbose: true) + get_target('proxy').run("expect -f /tmp/#{file} #{ipv4}", verbose: true) end When(/^I accept key of pxeboot minion in the Salt master$/) do - $server.run('salt-key -y --accept=pxeboot.example.org') + get_target('server').run('salt-key -y --accept=pxeboot.example.org') end When(/^I install the GPG key of the test packages repository on the PXE boot minion$/) do file = 'uyuni.key' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/tmp/' + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? system_name = get_system_name('pxeboot_minion') - $server.run("salt-cp #{system_name} #{dest} #{dest}") - $server.run("salt #{system_name} cmd.run 'rpmkeys --import #{dest}'") + get_target('server').run("salt-cp #{system_name} #{dest} #{dest}") + get_target('server').run("salt #{system_name} cmd.run 'rpmkeys --import #{dest}'") end When(/^I wait until Salt client is inactive on the PXE boot minion$/) do file = 'wait-end-of-cleanup-pxeboot.exp' source = File.dirname(__FILE__) + '/../upload_files/' + file dest = '/tmp/' + file - return_code = file_inject($proxy, source, dest) + return_code = file_inject(get_target('proxy'), source, dest) raise 'File injection failed' unless return_code.zero? ipv4 = net_prefix + ADDRESSES['pxeboot_minion'] - $proxy.run("expect -f /tmp/#{file} #{ipv4}") + get_target('proxy').run("expect -f /tmp/#{file} #{ipv4}") end When(/^I prepare the retail configuration file on server$/) do source = File.dirname(__FILE__) + '/../upload_files/massive-import-terminals.yml' dest = '/tmp/massive-import-terminals.yml' - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise "File #{file} couldn't be copied to server" unless return_code.zero? - sed_values = "s//#{$proxy.full_hostname}/; " + sed_values = "s//#{get_target('proxy').full_hostname}/; " sed_values << "s//#{net_prefix}/; " sed_values << "s//#{ADDRESSES['proxy']}/; " sed_values << "s//#{ADDRESSES['range begin']}/; " @@ -304,12 +304,12 @@ def compute_kiwi_profile_version(host) sed_values << "s//#{ADDRESSES['sle_minion']}/; " sed_values << "s//#{get_mac_address('sle_minion')}/; " sed_values << "s//#{compute_kiwi_profile_name('pxeboot_minion')}/" - $server.run("sed -i '#{sed_values}' #{dest}") + get_target('server').run("sed -i '#{sed_values}' #{dest}") end When(/^I import the retail configuration using retail_yaml command$/) do filepath = '/tmp/massive-import-terminals.yml' - $server.run("retail_yaml --api-user admin --api-pass admin --from-yaml #{filepath}") + get_target('server').run("retail_yaml --api-user admin --api-pass admin --from-yaml #{filepath}") end # Click on the terminal @@ -563,7 +563,7 @@ def compute_kiwi_profile_version(host) When(/^I am on the image store of the Kiwi image for organization "([^"]*)"$/) do |org| # There is no navigation step to access this URL, so we must use a visit call (https://github.com/SUSE/spacewalk/issues/15256) - visit("https://#{$server.full_hostname}/os-images/#{org}/") + visit("https://#{get_target('server').full_hostname}/os-images/#{org}/") end Then(/^I should see the name of the image for "([^"]*)"$/) do |host| @@ -573,6 +573,6 @@ def compute_kiwi_profile_version(host) Then(/^the image for "([^"]*)" should exist on the branch server$/) do |host| image = compute_kiwi_profile_name(host) - images, _code = $proxy.run('ls /srv/saltboot/image/') + images, _code = get_target('proxy').run('ls /srv/saltboot/image/') raise "Image #{image} for #{host} does not exist" unless images.include? image end diff --git a/testsuite/features/step_definitions/salt_steps.rb b/testsuite/features/step_definitions/salt_steps.rb index 3faa8726354b..3218da49fbae 100644 --- a/testsuite/features/step_definitions/salt_steps.rb +++ b/testsuite/features/step_definitions/salt_steps.rb @@ -14,7 +14,7 @@ # 300 is the default 1st keepalive interval for the minion # where it realizes the connection is stuck repeat_until_timeout(timeout: 300, retries: 3, message: "Master can not communicate with #{minion}", report_result: true) do - out, _code = $server.run("salt #{system_name} test.ping") + out, _code = get_target('server').run("salt #{system_name} test.ping") if out.include?(system_name) && out.include?('True') finished = Time.now log "Took #{finished.to_i - start.to_i} seconds to contact the minion" @@ -26,12 +26,12 @@ end When(/^I get the contents of the remote file "(.*?)"$/) do |filename| - $output, _code = $server.run("cat #{filename}") + $output, _code = get_target('server').run("cat #{filename}") end When(/^I stop salt-minion on "(.*?)"$/) do |minion| node = get_target(minion) - pkgname = $use_salt_bundle ? "venv-salt-minion" : "salt-minion" + pkgname = use_salt_bundle ? "venv-salt-minion" : "salt-minion" os_version = node.os_version os_family = node.os_family if os_family =~ /^sles/ && os_version =~ /^11/ @@ -43,7 +43,7 @@ When(/^I start salt-minion on "(.*?)"$/) do |minion| node = get_target(minion) - pkgname = $use_salt_bundle ? "venv-salt-minion" : "salt-minion" + pkgname = use_salt_bundle ? "venv-salt-minion" : "salt-minion" os_version = node.os_version os_family = node.os_family if os_family =~ /^sles/ && os_version =~ /^11/ @@ -55,7 +55,7 @@ When(/^I restart salt-minion on "(.*?)"$/) do |minion| node = get_target(minion) - pkgname = $use_salt_bundle ? "venv-salt-minion" : "salt-minion" + pkgname = use_salt_bundle ? "venv-salt-minion" : "salt-minion" os_version = node.os_version os_family = node.os_family if os_family =~ /^sles/ && os_version =~ /^11/ @@ -67,7 +67,7 @@ When(/^I refresh salt-minion grains on "(.*?)"$/) do |minion| node = get_target(minion) - salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" + salt_call = use_salt_bundle ? "venv-salt-call" : "salt-call" node.run("#{salt_call} saltutil.refresh_grains") end @@ -76,7 +76,7 @@ repeat_until_timeout(timeout: key_timeout.to_i, message: "Minion '#{minion}' is not listed among #{key_type} keys on Salt master") do system_name = get_system_name(minion) unless system_name.empty? - output, return_code = $server.run(cmd, check_errors: false) + output, return_code = get_target('server').run(cmd, check_errors: false) break if return_code.zero? && output.include?(system_name) end sleep 1 @@ -84,7 +84,7 @@ end When(/^I wait until Salt client is inactive on "([^"]*)"$/) do |minion| - salt_minion = $use_salt_bundle ? "venv-salt-minion" : "salt-minion" + salt_minion = use_salt_bundle ? "venv-salt-minion" : "salt-minion" step %(I wait until "#{salt_minion}" service is inactive on "#{minion}") end @@ -100,21 +100,21 @@ When(/^I delete "([^"]*)" key in the Salt master$/) do |host| system_name = get_system_name(host) - $output, _code = $server.run("salt-key -y -d #{system_name}", check_errors: false) + $output, _code = get_target('server').run("salt-key -y -d #{system_name}", check_errors: false) end When(/^I accept "([^"]*)" key in the Salt master$/) do |host| system_name = get_system_name(host) - $server.run("salt-key -y --accept=#{system_name}*") + get_target('server').run("salt-key -y --accept=#{system_name}*") end When(/^I list all Salt keys shown on the Salt master$/) do - $server.run("salt-key --list-all", check_errors: false, verbose: true) + get_target('server').run("salt-key --list-all", check_errors: false, verbose: true) end When(/^I get OS information of "([^"]*)" from the Master$/) do |host| system_name = get_system_name(host) - $output, _code = $server.run("salt #{system_name} grains.get osfullname") + $output, _code = get_target('server').run("salt #{system_name} grains.get osfullname") end Then(/^it should contain a "([^"]*?)" text$/) do |content| @@ -130,16 +130,16 @@ When(/^I apply state "([^"]*)" to "([^"]*)"$/) do |state, host| system_name = get_system_name(host) - $server.run("salt #{system_name} state.apply #{state}", verbose: true) + get_target('server').run("salt #{system_name} state.apply #{state}", verbose: true) end Then(/^salt\-api should be listening on local port (\d+)$/) do |port| - $output, _code = $server.run("ss -ntl | grep #{port}") + $output, _code = get_target('server').run("ss -ntl | grep #{port}") assert_match(/127.0.0.1:#{port}/, $output) end Then(/^salt\-master should be listening on public port (\d+)$/) do |port| - $output, _code = $server.run("ss -ntl | grep #{port}") + $output, _code = get_target('server').run("ss -ntl | grep #{port}") assert_match(/(0.0.0.0|\*|\[::\]):#{port}/, $output) end @@ -159,7 +159,7 @@ Then(/^"(.*?)" should have been reformatted$/) do |host| system_name = get_system_name(host) - output, _code = $server.run("salt #{system_name} file.file_exists /intact") + output, _code = get_target('server').run("salt #{system_name} file.file_exists /intact") raise "Minion #{host} is intact" unless output.include? 'False' end @@ -199,38 +199,38 @@ # Salt formulas When(/^I manually install the "([^"]*)" formula on the server$/) do |package| - $server.run("zypper --non-interactive refresh") - $server.run("zypper --non-interactive install --force #{package}-formula") + get_target('server').run("zypper --non-interactive refresh") + get_target('server').run("zypper --non-interactive install --force #{package}-formula") end When(/^I manually uninstall the "([^"]*)" formula from the server$/) do |package| - $server.run("zypper --non-interactive remove #{package}-formula") + get_target('server').run("zypper --non-interactive remove #{package}-formula") # Remove automatically installed dependency if needed if package == 'uyuni-config' - $server.run("zypper --non-interactive remove #{package}-modules") + get_target('server').run("zypper --non-interactive remove #{package}-modules") end end When(/^I synchronize all Salt dynamic modules on "([^"]*)"$/) do |host| system_name = get_system_name(host) - $server.run("salt #{system_name} saltutil.sync_all") + get_target('server').run("salt #{system_name} saltutil.sync_all") end When(/^I remove "([^"]*)" from salt cache on "([^"]*)"$/) do |filename, host| node = get_target(host) - salt_cache = $use_salt_bundle ? "/var/cache/venv-salt-minion/" : "/var/cache/salt/" + salt_cache = use_salt_bundle ? "/var/cache/venv-salt-minion/" : "/var/cache/salt/" file_delete(node, "#{salt_cache}#{filename}") end When(/^I remove "([^"]*)" from salt minion config directory on "([^"]*)"$/) do |filename, host| node = get_target(host) - salt_config = $use_salt_bundle ? "/etc/venv-salt-minion/minion.d/" : "/etc/salt/minion.d/" + salt_config = use_salt_bundle ? "/etc/venv-salt-minion/minion.d/" : "/etc/salt/minion.d/" file_delete(node, "#{salt_config}#{filename}") end When(/^I configure salt minion on "([^"]*)"$/) do |host| content = %( -master: #{$server.full_hostname} +master: #{get_target('server').full_hostname} server_id_use_crc: adler32 enable_legacy_startup_events: False enable_fqdns_grains: False @@ -242,7 +242,7 @@ end When(/^I store "([^"]*)" into file "([^"]*)" in salt minion config directory on "([^"]*)"$/) do |content, filename, host| - salt_config = $use_salt_bundle ? "/etc/venv-salt-minion/minion.d/" : "/etc/salt/minion.d/" + salt_config = use_salt_bundle ? "/etc/venv-salt-minion/minion.d/" : "/etc/salt/minion.d/" step %(I store "#{content}" into file "#{salt_config}#{filename}" on "#{host}") end @@ -301,12 +301,12 @@ end When(/^I refresh the pillar data$/) do - $server.run("salt '#{$minion.full_hostname}' saltutil.refresh_pillar wait=True") + get_target('server').run("salt '#{get_target('sle_minion').full_hostname}' saltutil.refresh_pillar wait=True") end When(/^I wait until there is no pillar refresh salt job active$/) do repeat_until_timeout(message: "pillar refresh job still active") do - output, = $server.run("salt-run jobs.active") + output, = get_target('server').run("salt-run jobs.active") break unless output.include?("saltutil.refresh_pillar") sleep 1 end @@ -327,7 +327,7 @@ def pillar_get(key, minion) else raise 'Invalid target' end - $server.run("#{cmd} #{system_name} pillar.get #{key}") + get_target('server').run("#{cmd} #{system_name} pillar.get #{key}") end Then(/^the pillar data for "([^"]*)" should be "([^"]*)" on "([^"]*)"$/) do |key, value, minion| @@ -360,7 +360,7 @@ def pillar_get(key, minion) end Given(/^I try to download "([^"]*)" from channel "([^"]*)"$/) do |rpm, channel| - url = "https://#{$server.full_hostname}/rhn/manager/download/#{channel}/getPackage/#{rpm}" + url = "https://#{get_target('server').full_hostname}/rhn/manager/download/#{channel}/getPackage/#{rpm}" url = "#{url}?#{@token}" if @token @download_path = nil @download_error = nil @@ -400,7 +400,7 @@ def pillar_get(key, minion) When(/^I see "([^"]*)" fingerprint$/) do |host| node = get_target(host) - salt_call = $use_salt_bundle ? "venv-salt-call" : "salt-call" + salt_call = use_salt_bundle ? "venv-salt-call" : "salt-call" output, _code = node.run("#{salt_call} --local key.finger") fing = output.split("\n")[1].strip! raise "Text: #{fing} not found" unless has_content?(fing) @@ -457,10 +457,10 @@ def pillar_get(key, minion) file = 'salt_event_parser.py' source = "#{File.dirname(__FILE__)}/../upload_files/#{file}" dest = "/tmp/#{file}" - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? # print failures from salt event log - output, _code = $server.run("python3 /tmp/#{file}") + output, _code = get_target('server').run("python3 /tmp/#{file}") count_failures = output.to_s.scan(/false/).length output = output.join.to_s if output.respond_to?(:join) # Ignore the error if there is only the expected failure from min_salt_lock_packages.feature @@ -472,13 +472,13 @@ def pillar_get(key, minion) # salt-ssh steps When(/^I install Salt packages from "(.*?)"$/) do |host| target = get_target(host) - pkgs = $use_salt_bundle ? "venv-salt-minion" : "salt salt-minion" + pkgs = use_salt_bundle ? "venv-salt-minion" : "salt salt-minion" if suse_host?(host) target.run("test -e /usr/bin/zypper && zypper --non-interactive install -y #{pkgs}", check_errors: false) elsif rh_host?(host) target.run("test -e /usr/bin/yum && yum -y install #{pkgs}", check_errors: false) elsif deb_host?(host) - pkgs = "salt-common salt-minion" if $product != 'Uyuni' + pkgs = "salt-common salt-minion" if product != 'Uyuni' target.run("test -e /usr/bin/apt && apt -y install #{pkgs}", check_errors: false) end end @@ -494,8 +494,8 @@ def pillar_get(key, minion) # minion bootstrap steps Then(/^I run spacecmd listevents for "([^"]*)"$/) do |host| system_name = get_system_name(host) - $server.run('spacecmd -u admin -p admin clear_caches') - $server.run("spacecmd -u admin -p admin system_listevents #{system_name}") + get_target('server').run('spacecmd -u admin -p admin clear_caches') + get_target('server').run("spacecmd -u admin -p admin system_listevents #{system_name}") end When(/^I enter KVM Server password$/) do @@ -504,7 +504,7 @@ def pillar_get(key, minion) When(/^I perform a full salt minion cleanup on "([^"]*)"$/) do |host| node = get_target(host) - if $use_salt_bundle + if use_salt_bundle if rh_host?(host) node.run("yum -y remove --setopt=clean_requirements_on_remove=1 venv-salt-minion", check_errors: false) elsif deb_host?(host) @@ -544,12 +544,12 @@ def pillar_get(key, minion) content = "pkg_download_point_protocol: #{uri.scheme}\n"\ "pkg_download_point_host: #{uri.host}\n"\ "pkg_download_point_port: #{uri.port}" - $server.run("echo -e \"#{content}\" > #{filepath}") + get_target('server').run("echo -e \"#{content}\" > #{filepath}") end When(/^I delete the package download endpoint pillar file from the server$/) do filepath = '/srv/pillar/pkg_endpoint.sls' - return_code = file_delete($server, filepath) + return_code = file_delete(get_target('server'), filepath) raise 'File deletion failed' unless return_code.zero? end @@ -557,22 +557,22 @@ def pillar_get(key, minion) source = File.dirname(__FILE__) + '/../upload_files/' + file dest = "/srv/formula_metadata/" + formula + '/' + file - $server.run("mkdir -p /srv/formula_metadata/" + formula) - return_code = file_inject($server, source, dest) + get_target('server').run("mkdir -p /srv/formula_metadata/" + formula) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? - $server.run("chmod 644 " + dest) + get_target('server').run("chmod 644 " + dest) end When(/^I migrate "([^"]*)" from salt-minion to venv-salt-minion$/) do |host| node = get_target(host) system_name = node.full_hostname migrate = "salt #{system_name} state.apply util.mgr_switch_to_venv_minion" - $server.run(migrate, check_errors: true, verbose: true) + get_target('server').run(migrate, check_errors: true, verbose: true) end When(/^I purge salt-minion on "([^"]*)" after a migration$/) do |host| node = get_target(host) system_name = node.full_hostname cleanup = %(salt #{system_name} state.apply util.mgr_switch_to_venv_minion pillar='{"mgr_purge_non_venv_salt_files": True, "mgr_purge_non_venv_salt": True}') - $server.run(cleanup, check_errors: true, verbose: true) + get_target('server').run(cleanup, check_errors: true, verbose: true) end diff --git a/testsuite/features/step_definitions/setup_steps.rb b/testsuite/features/step_definitions/setup_steps.rb index 6aec20e3b247..6943dd6fdd79 100644 --- a/testsuite/features/step_definitions/setup_steps.rb +++ b/testsuite/features/step_definitions/setup_steps.rb @@ -153,7 +153,7 @@ end Then(/^the SLE15 (SP3|SP4) product should be added$/) do |sp_version| - output, _code = $server.run('echo -e "admin\nadmin\n" | mgr-sync list channels', check_errors: false, buffer_size: 1_000_000) + output, _code = get_target('server').run('echo -e "admin\nadmin\n" | mgr-sync list channels', check_errors: false, buffer_size: 1_000_000) STDOUT.puts "Products list:\n#{output}" match = "[I] SLE-Product-SLES15-#{sp_version}-Pool for x86_64 SUSE Linux Enterprise Server 15 #{sp_version} x86_64 [sle-product-sles15-#{sp_version.downcase}-pool-x86_64]" raise "Not included:\n #{match}" unless output.include? match @@ -212,8 +212,8 @@ command = "spacecmd -u admin -p admin system_list" system_name = get_system_name(host) repeat_until_timeout(message: "system #{system_name} is not in the list yet") do - $server.run("spacecmd -u admin -p admin clear_caches") - result, _code = $server.run(command, check_errors: false, verbose: true) + get_target('server').run("spacecmd -u admin -p admin clear_caches") + result, _code = get_target('server').run(command, check_errors: false, verbose: true) break if result.include? system_name sleep 1 end @@ -258,7 +258,7 @@ def token(secret, claims = {}) end def server_secret - rhnconf, _code = $server.run('cat /etc/rhn/rhn.conf', check_errors: false) + rhnconf, _code = get_target('server').run('cat /etc/rhn/rhn.conf', check_errors: false) data = /server.secret_key\s*=\s*(\h+)$/.match(rhnconf) data[1].strip end diff --git a/testsuite/features/step_definitions/smdba_steps.rb b/testsuite/features/step_definitions/smdba_steps.rb index a7c489c05870..05d45ef6fe5c 100644 --- a/testsuite/features/step_definitions/smdba_steps.rb +++ b/testsuite/features/step_definitions/smdba_steps.rb @@ -5,35 +5,35 @@ ### and access to the database. Given(/^a postgresql database is running$/) do - $output, _code = $server.run('file /var/lib/pgsql/data/postgresql.conf', check_errors: false) + $output, _code = get_target('server').run('file /var/lib/pgsql/data/postgresql.conf', check_errors: false) unless $output.include? 'ASCII text' log 'Tests require Postgresql database, skipping...' pending end - smdba_db_status, _code = $server.run('smdba db-status', check_errors: false) + smdba_db_status, _code = get_target('server').run('smdba db-status', check_errors: false) if smdba_db_status.include? 'online' log 'Database is running' else - $server.run('smdba db-start') - smdba_db_status, _code = $server.run('smdba db-status', check_errors: false) + get_target('server').run('smdba db-start') + smdba_db_status, _code = get_target('server').run('smdba db-status', check_errors: false) assert_includes(smdba_db_status, 'online') end end Given(/^there is no such "(.*?)" directory$/) do |bkp_dir| - $server.run("test -d #{bkp_dir} && rm -rf #{bkp_dir}", check_errors: false) + get_target('server').run("test -d #{bkp_dir} && rm -rf #{bkp_dir}", check_errors: false) end When(/^I start database with the command "(.*?)"$/) do |start_command| - $output, _code = $server.run(start_command) + $output, _code = get_target('server').run(start_command) end When(/^I stop the database with the command "(.*?)"$/) do |stop_command| - $output, _code = $server.run(stop_command) + $output, _code = get_target('server').run(stop_command) end When(/^I check the database status with the command "(.*?)"$/) do |check_command| - $output, _code = $server.run(check_command) + $output, _code = get_target('server').run(check_command) end When(/^I see that the database is "(.*?)" or "(.*?)" as it might already running$/) do |scs_status, fl_status| @@ -49,14 +49,14 @@ end When(/^I configure "(.*?)" parameter "(.*?)" to "(.*?)"$/) do |config_file, param, value| - $server.run("sed -i '/wal_level/d' #{config_file}", check_errors: false) - $server.run("echo \"#{param} = #{value}\" >> #{config_file}", check_errors: false) - local_output, _code = $server.run("cat #{config_file} | grep #{param}", check_errors: false) + get_target('server').run("sed -i '/wal_level/d' #{config_file}", check_errors: false) + get_target('server').run("echo \"#{param} = #{value}\" >> #{config_file}", check_errors: false) + local_output, _code = get_target('server').run("cat #{config_file} | grep #{param}", check_errors: false) assert_includes(local_output, value) end Then(/^I check internally configuration for "(.*?)" option$/) do |_config_key| - $current_checked_config_value, _code = $server.run("cd /;sudo -u postgres psql -c 'show wal_level;'", check_errors: false) + $current_checked_config_value, _code = get_target('server').run("cd /;sudo -u postgres psql -c 'show wal_level;'", check_errors: false) end Then(/^the configuration should be set to "(.*?)"$/) do |value| @@ -68,7 +68,7 @@ end Then(/^I issue command "(.*?)"$/) do |command| - $output, _code = $server.run(command, check_errors: false) + $output, _code = get_target('server').run(command, check_errors: false) end Then(/^tablespace "([^"]*)" should be listed$/) do |ts| @@ -88,16 +88,16 @@ # Given(/^database "(.*?)" has no table "(.*?)"$/) do |dbname, tbl| $db = dbname - out, err, _code = $server.run("sudo -u postgres psql -d #{$db} -c 'drop table dummy'", separated_results: true, check_errors: false) + out, err, _code = get_target('server').run("sudo -u postgres psql -d #{$db} -c 'drop table dummy'", separated_results: true, check_errors: false) refute_includes(out, 'DROP TABLE') assert_includes(err, "table \"#{tbl}\" does not exist") end When(/^I create backup directory "(.*?)" with UID "(.*?)" and GID "(.*?)"$/) do |bkp_dir, uid, gid| - $server.run("mkdir /#{bkp_dir};chown #{uid}:#{gid} /#{bkp_dir}") + get_target('server').run("mkdir /#{bkp_dir};chown #{uid}:#{gid} /#{bkp_dir}") bkp_dir.sub!('/', '') log 'Backup directory:' - log $server.run("ls -la / | /usr/bin/grep #{bkp_dir}", check_errors: false)[0] + log get_target('server').run("ls -la / | /usr/bin/grep #{bkp_dir}", check_errors: false)[0] end Then(/^I should see error message that asks "(.*?)" belong to the same UID\/GID as "(.*?)" directory$/) do |bkp_dir, data_dir| @@ -111,14 +111,14 @@ end Then(/^I remove backup directory "(.*?)"$/) do |bkp_dir| - $server.run("test -d #{bkp_dir} && rm -rf #{bkp_dir}") + get_target('server').run("test -d #{bkp_dir} && rm -rf #{bkp_dir}") end When(/^I change Access Control List on "(.*?)" directory to "(.*?)"$/) do |bkp_dir, acl_octal| bkp_dir.sub!('/', '') - $server.run("test -d /#{bkp_dir} && chmod #{acl_octal} /#{bkp_dir}") + get_target('server').run("test -d /#{bkp_dir} && chmod #{acl_octal} /#{bkp_dir}") log "Backup directory, ACL to \"#{acl_octal}\":" - log $server.run("ls -la / | /usr/bin/grep #{bkp_dir}", check_errors: false)[0] + log get_target('server').run("ls -la / | /usr/bin/grep #{bkp_dir}", check_errors: false)[0] log "\n*** Taking backup, this might take a while ***\n" end @@ -128,17 +128,17 @@ Then(/^in "(.*?)" directory there is "(.*?)" file and at least one backup checkpoint file$/) do |bkp_dir, archive_file| refute_includes( - $server.run("test -f #{bkp_dir}/#{archive_file} && echo \"exists\" || echo \"missing\"", check_errors: false), + get_target('server').run("test -f #{bkp_dir}/#{archive_file} && echo \"exists\" || echo \"missing\"", check_errors: false), 'missing' ) refute_includes( - $server.run("ls #{bkp_dir}/*.backup 1>/dev/null 2>/dev/null && echo \"exists\" || echo \"missing\"", check_errors: false), + get_target('server').run("ls #{bkp_dir}/*.backup 1>/dev/null 2>/dev/null && echo \"exists\" || echo \"missing\"", check_errors: false), 'missing' ) end Then(/^parameter "(.*?)" in the configuration file "(.*?)" is "(.*?)"$/) do |param, cfg_file, fuzzy_value| - $output, _code = $server.run("cat #{cfg_file} | grep #{param}") + $output, _code = get_target('server').run("cat #{cfg_file} | grep #{param}") assert_includes($output, fuzzy_value) end @@ -147,17 +147,17 @@ end When(/^I set a checkpoint$/) do - $server.run("sudo -u postgres psql -d #{$db} -c 'checkpoint' 2>/dev/null", check_errors: false) + get_target('server').run("sudo -u postgres psql -d #{$db} -c 'checkpoint' 2>/dev/null", check_errors: false) end When(/^in the database I create dummy table "(.*?)" with column "(.*?)" and value "(.*?)"$/) do |tbl, clm, val| fn = '/tmp/smdba-data-test.sql' - $server.run("echo \"create table #{tbl} (#{clm} varchar);insert into #{tbl} (#{clm}) values (\'#{val}\');\" > #{fn}", check_errors: false) - $server.run("sudo -u postgres psql -d #{$db} -c 'drop table dummy' 2>/dev/null", check_errors: false) - $server.run("sudo -u postgres psql -d #{$db} -af #{fn}", check_errors: false) - $server.run("file -f #{fn} && rm #{fn}") + get_target('server').run("echo \"create table #{tbl} (#{clm} varchar);insert into #{tbl} (#{clm}) values (\'#{val}\');\" > #{fn}", check_errors: false) + get_target('server').run("sudo -u postgres psql -d #{$db} -c 'drop table dummy' 2>/dev/null", check_errors: false) + get_target('server').run("sudo -u postgres psql -d #{$db} -af #{fn}", check_errors: false) + get_target('server').run("file -f #{fn} && rm #{fn}") assert_includes( - $server.run("sudo -u postgres psql -d #{$db} -c 'select * from dummy' 2>/dev/null", check_errors: false)[0], + get_target('server').run("sudo -u postgres psql -d #{$db} -c 'select * from dummy' 2>/dev/null", check_errors: false)[0], val ) log "Table \"#{tbl}\" has been created with some dummy data inside" @@ -165,13 +165,13 @@ When(/^I restore database from the backup$/) do log "\n*** Restoring database from the backup. This will may take a while. ***\n\n" - output, code = $server.run('smdba backup-restore') + output, code = get_target('server').run('smdba backup-restore') log "#{output}\n\n" raise 'Restore Failed' unless code.zero? end Then(/^I disable backup in the directory "(.*?)"$/) do |_arg1| assert_includes( - $server.run('smdba backup-hot --enable=off', check_errors: false)[0], 'Finished' + get_target('server').run('smdba backup-hot --enable=off', check_errors: false)[0], 'Finished' ) end diff --git a/testsuite/features/support/code_coverage.rb b/testsuite/features/support/code_coverage.rb index 2165e9d9dae5..1021e28643ed 100644 --- a/testsuite/features/support/code_coverage.rb +++ b/testsuite/features/support/code_coverage.rb @@ -69,8 +69,8 @@ def jacoco_dump(feature_name, html = false, xml = true, source = false) sourcefiles = source ? '--sourcefiles /tmp/uyuni-master/java/code/src' : '' classfiles = '--classfiles /srv/tomcat/webapps/rhn/WEB-INF/lib/rhn.jar' dump_path = "/tmp/jacoco-#{feature_name}.exec" - $server.run("#{cli} dump --address localhost --destfile #{dump_path} --port 6300 --reset") - $server.run("#{cli} report #{dump_path} #{html_report} #{xml_report} #{sourcefiles} #{classfiles}") - file_extract($server, "/srv/www/htdocs/pub/jacoco-#{feature_name}.xml", "/tmp/jacoco-#{feature_name}.xml") + get_target('server').run("#{cli} dump --address localhost --destfile #{dump_path} --port 6300 --reset") + get_target('server').run("#{cli} report #{dump_path} #{html_report} #{xml_report} #{sourcefiles} #{classfiles}") + file_extract(get_target('server'), "/srv/www/htdocs/pub/jacoco-#{feature_name}.xml", "/tmp/jacoco-#{feature_name}.xml") end end diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb index e469351bdc37..9d80cb3436d7 100644 --- a/testsuite/features/support/commonlib.rb +++ b/testsuite/features/support/commonlib.rb @@ -36,7 +36,7 @@ def compute_channels_to_leave_running else CHANNEL_TO_SYNCH_BY_OS_VERSION['default'] end - [$minion, $build_host, $ssh_minion, $rhlike_minion].each do |node| + [get_target('sle_minion'), get_target('build_host'), get_target('ssh_minion'), get_target('rhlike_minion')].each do |node| next unless node os_version = node.os_version os_family = node.os_family @@ -56,18 +56,18 @@ def count_table_items end def product - _product_raw, code = $server.run('rpm -q patterns-uyuni_server', check_errors: false) + _product_raw, code = get_target('server').run('rpm -q patterns-uyuni_server', check_errors: false) return 'Uyuni' if code.zero? - _product_raw, code = $server.run('rpm -q patterns-suma_server', check_errors: false) + _product_raw, code = get_target('server').run('rpm -q patterns-suma_server', check_errors: false) return 'SUSE Manager' if code.zero? raise 'Could not determine product' end def product_version - product_raw, code = $server.run('rpm -q patterns-uyuni_server', check_errors: false) + product_raw, code = get_target('server').run('rpm -q patterns-uyuni_server', check_errors: false) m = product_raw.match(/patterns-uyuni_server-(.*)-.*/) return m[1] if code.zero? && !m.nil? - product_raw, code = $server.run('rpm -q patterns-suma_server', check_errors: false) + product_raw, code = get_target('server').run('rpm -q patterns-suma_server', check_errors: false) m = product_raw.match(/patterns-suma_server-(.*)-.*/) return m[1] if code.zero? && !m.nil? raise 'Could not determine product version' @@ -75,16 +75,16 @@ def product_version def use_salt_bundle # Use venv-salt-minion in Uyuni, or SUMA Head, 4.2 and 4.3 - $product == 'Uyuni' || %w[head 4.3 4.2].include?($product_version) + product == 'Uyuni' || %w[head 4.3 4.2].include?(product_version) end # create salt pillar file in the default pillar_roots location def inject_salt_pillar_file(source, file) dest = '/srv/pillar/' + file - return_code = file_inject($server, source, dest) + return_code = file_inject(get_target('server'), source, dest) raise 'File injection failed' unless return_code.zero? # make file readable by salt - $server.run("chgrp salt #{dest}") + get_target('server').run("chgrp salt #{dest}") return_code end @@ -305,7 +305,7 @@ def get_os_version(node) [os_version, os_family] end -def get_gpg_keys(node, target = $server) +def get_gpg_keys(node, target = get_target('server')) os_version, os_family = get_os_version(node) if os_family =~ /^sles/ # HACK: SLE 15 uses SLE 12 GPG key @@ -333,3 +333,100 @@ def add_context(key, value) $context[$feature_scope] = {} unless $context.key?($feature_scope) $context[$feature_scope].merge!({ key => value }) end + +# This function gets the system name, as displayed in systems list +# * for the usual clients, it is the full hostname, e.g. suma-41-min-sle15.tf.local +# * for the PXE booted clients, it is derived from the branch name, the hardware type, +# and a fingerprint, e.g. example.Intel-Genuine-None-d6df84cca6f478cdafe824e35bbb6e3b +def get_system_name(host) + case host + # The PXE boot minion and the terminals are not directly accessible on the network, + # therefore they are not represented by a twopence node + when 'pxeboot_minion' + output, _code = get_target('server').run('salt-key') + system_name = + output.split.find do |word| + word =~ /example.Intel-Genuine-None-/ || word =~ /example.pxeboot-/ || word =~ /example.Intel/ || word =~ /pxeboot-/ + end + system_name = 'pxeboot.example.org' if system_name.nil? + when 'sle12sp5_terminal' + output, _code = get_target('server').run('salt-key') + system_name = + output.split.find do |word| + word =~ /example.sle12sp5terminal-/ + end + system_name = 'sle12sp5terminal.example.org' if system_name.nil? + when 'sle15sp4_terminal' + output, _code = get_target('server').run('salt-key') + system_name = + output.split.find do |word| + word =~ /example.sle15sp4terminal-/ + end + system_name = 'sle15sp4terminal.example.org' if system_name.nil? + when 'containerized_proxy' + system_name = get_target('proxy').full_hostname.sub('pxy', 'pod-pxy') + else + begin + node = get_target(host) + system_name = node.full_hostname + rescue RuntimeError + # If the node for that host is not defined, just return the host parameter as system_name + system_name = host + end + end + system_name +end + +# Get MAC address of system +def get_mac_address(host) + if host == 'pxeboot_minion' + mac = ENV['PXEBOOT_MAC'] + else + node = get_target(host) + output, _code = node.run('ip link show dev eth1') + mac = output.split("\n")[1].split[1] + end + mac +end + +# This function returns the net prefix, caching it +def net_prefix + $net_prefix = $private_net.sub(%r{\.0+/24$}, '.') if $net_prefix.nil? && !$private_net.nil? + $net_prefix +end + +# This function tests whether a file exists on a node +def file_exists?(node, file) + _out, local, _remote, code = node.test_and_store_results_together("test -f #{file}", 'root', 500) + code.zero? && local.zero? +end + +# This function tests whether a folder exists on a node +def folder_exists?(node, file) + _out, local, _remote, code = node.test_and_store_results_together("test -d #{file}", 'root', 500) + code.zero? && local.zero? +end + +# This function deletes a file from a node +def file_delete(node, file) + _out, _local, _remote, code = node.test_and_store_results_together("rm #{file}", 'root', 500) + code +end + +# This function deletes a file from a node +def folder_delete(node, folder) + _out, _local, _remote, code = node.test_and_store_results_together("rm -rf #{folder}", 'root', 500) + code +end + +# This function extracts a file from a node +def file_extract(node, remote_file, local_file) + code, _remote = node.extract_file(remote_file, local_file, 'root', false) + code +end + +# This function injects a file into a node +def file_inject(node, local_file, remote_file) + code, _remote = node.inject_file(local_file, remote_file, 'root', false) + code +end diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb index 7df9ec17d57c..6158f678ceff 100644 --- a/testsuite/features/support/constants.rb +++ b/testsuite/features/support/constants.rb @@ -1,6 +1,71 @@ # Copyright (c) 2019-2023 SUSE LLC # Licensed under the terms of the MIT license. +ENV_VAR_BY_HOST = { 'localhost' => 'HOSTNAME', + 'proxy' => 'PROXY', + 'server' => 'SERVER', + 'kvm_server' => 'VIRTHOST_KVM_URL', + 'sle_minion' => 'MINION', + 'ssh_minion' => 'SSH_MINION', + 'rhlike_minion' => 'RHLIKE_MINION', + 'deblike_minion' => 'DEBLIKE_MINION', + 'build_host' => 'BUILD_HOST', + 'salt_migration_minion' => 'MIN_NESTED', + # Build Validation environment + 'sle12sp4_minion' => 'SLE12SP4_MINION', + 'sle12sp4_ssh_minion' => 'SLE12SP4_SSHMINION', + 'sle12sp5_minion' => 'SLE12SP5_MINION', + 'sle12sp5_ssh_minion' => 'SLE12SP5_SSHMINION', + 'sle15sp1_minion' => 'SLE15SP1_MINION', + 'sle15sp1_ssh_minion' => 'SLE15SP1_SSHMINION', + 'sle15sp2_minion' => 'SLE15SP2_MINION', + 'sle15sp2_ssh_minion' => 'SLE15SP2_SSHMINION', + 'sle15sp3_minion' => 'SLE15SP3_MINION', + 'sle15sp3_ssh_minion' => 'SLE15SP3_SSHMINION', + 'sle15sp4_minion' => 'SLE15SP4_MINION', + 'sle15sp4_ssh_minion' => 'SLE15SP4_SSHMINION', + 'sle15sp5_minion' => 'SLE15SP5_MINION', + 'sle15sp5_ssh_minion' => 'SLE15SP5_SSHMINION', + 'slemicro51_minion' => 'SLEMICRO51_MINION', + 'slemicro51_ssh_minion' => 'SLEMICRO51_SSHMINION', + 'slemicro52_minion' => 'SLEMICRO52_MINION', + 'slemicro52_ssh_minion' => 'SLEMICRO52_SSHMINION', + 'slemicro53_minion' => 'SLEMICRO53_MINION', + 'slemicro53_ssh_minion' => 'SLEMICRO53_SSHMINION', + 'slemicro54_minion' => 'SLEMICRO54_MINION', + 'slemicro54_ssh_minion' => 'SLEMICRO54_SSHMINION', + 'alma9_minion' => 'ALMA9_MINION', + 'alma9_ssh_minion' => 'ALMA9_SSHMINION', + 'centos7_minion' => 'CENTOS7_MINION', + 'centos7_ssh_minion' => 'CENTOS7_SSHMINION', + 'liberty9_minion' => 'LIBERTY9_MINION', + 'liberty9_ssh_minion' => 'LIBERTY9_SSHMINION', + 'oracle9_minion' => 'ORACLE9_MINION', + 'oracle9_ssh_minion' => 'ORACLE9_SSHMINION', + 'rhel9_minion' => 'RHEL9_MINION', + 'rhel9_ssh_minion' => 'RHEL9_SSHMINION', + 'rocky8_minion' => 'ROCKY8_MINION', + 'rocky8_ssh_minion' => 'ROCKY8_SSHMINION', + 'rocky9_minion' => 'ROCKY9_MINION', + 'rocky9_ssh_minion' => 'ROCKY9_SSHMINION', + 'ubuntu1804_minion' => 'UBUNTU1804_MINION', + 'ubuntu1804_ssh_minion' => 'UBUNTU1804_SSHMINION', + 'ubuntu2004_minion' => 'UBUNTU2004_MINION', + 'ubuntu2004_ssh_minion' => 'UBUNTU2004_SSHMINION', + 'ubuntu2204_minion' => 'UBUNTU2204_MINION', + 'ubuntu2204_ssh_minion' => 'UBUNTU2204_SSHMINION', + 'debian10_minion' => 'DEBIAN10_MINION', + 'debian10_ssh_minion' => 'DEBIAN10_SSHMINION', + 'debian11_minion' => 'DEBIAN11_MINION', + 'debian11_ssh_minion' => 'DEBIAN11_SSHMINION', + 'opensuse154arm_minion' => 'OPENSUSE154ARM_MINION', + 'opensuse154arm_ssh_minion' => 'OPENSUSE154ARM_SSHMINION', + 'opensuse155arm_minion' => 'OPENSUSE155ARM_MINION', + 'opensuse155arm_ssh_minion' => 'OPENSUSE155ARM_SSHMINION', + 'sle12sp5_buildhost' => 'SLE12SP5_BUILDHOST', + 'sle15sp4_buildhost' => 'SLE15SP4_BUILDHOST', + 'monitoring_server' => 'MONITORING_SERVER' }.freeze + ADDRESSES = { 'network' => '0', 'sle_minion' => '3', 'pxeboot_minion' => '4', diff --git a/testsuite/features/support/env.rb b/testsuite/features/support/env.rb index 929392cf67a1..448e496fa047 100644 --- a/testsuite/features/support/env.rb +++ b/testsuite/features/support/env.rb @@ -15,6 +15,7 @@ require 'multi_test' require 'set' require_relative 'code_coverage' +require_relative 'twopence_env' ## code coverage analysis # SimpleCov.start @@ -35,6 +36,18 @@ # Context per feature $context = {} +# Other global variables +$pxeboot_mac = ENV['PXEBOOT_MAC'] +$pxeboot_image = ENV['PXEBOOT_IMAGE'] || 'sles15sp3o' +$sle12sp5_terminal_mac = ENV['SLE12SP5_TERMINAL_MAC'] +$sle15sp4_terminal_mac = ENV['SLE15SP4_TERMINAL_MAC'] +$private_net = ENV['PRIVATENET'] if ENV['PRIVATENET'] +$mirror = ENV['MIRROR'] +$server_http_proxy = ENV['SERVER_HTTP_PROXY'] if ENV['SERVER_HTTP_PROXY'] +$custom_download_endpoint = ENV['CUSTOM_DOWNLOAD_ENDPOINT'] if ENV['CUSTOM_DOWNLOAD_ENDPOINT'] +$no_auth_registry = ENV['NO_AUTH_REGISTRY'] if ENV['NO_AUTH_REGISTRY'] +$auth_registry = ENV['AUTH_REGISTRY'] if ENV['AUTH_REGISTRY'] + # maximal wait before giving up # the tests return much before that delay in case of success STDOUT.sync = true @@ -43,7 +56,7 @@ DEFAULT_TIMEOUT = ENV['DEFAULT_TIMEOUT'] ? ENV['DEFAULT_TIMEOUT'].to_i : 250 $is_cloud_provider = ENV["PROVIDER"].include? 'aws' $is_container_provider = ENV["PROVIDER"].include? 'podman' -$is_container_server = ['k3s', 'podman'].include? ENV.fetch("CONTAINER_RUNTIME", '') +$is_container_server = %w[k3s podman].include? ENV.fetch("CONTAINER_RUNTIME", '') $is_using_build_image = ENV.fetch('IS_USING_BUILD_IMAGE') { false } $is_using_scc_repositories = (ENV.fetch('IS_USING_SCC_REPOSITORIES', 'False') != 'False') @@ -55,11 +68,6 @@ $build_validation = true end -def enable_assertions - # include assertion globally - World(MiniTest::Assertions) -end - # Fix a problem with minitest and cucumber options passed through rake MultiTest.disable_autorun @@ -105,7 +113,7 @@ def enable_assertions STDOUT.puts "Capybara APP Host: #{Capybara.app_host}:#{Capybara.server_port}" # enable minitest assertions in steps -enable_assertions +World(MiniTest::Assertions) # Init CodeCoverage Handler $code_coverage = CodeCoverage.new(ENV['REDIS_HOST'], ENV['REDIS_PORT'], ENV['REDIS_USERNAME'], ENV['REDIS_PASSWORD']) if $code_coverage_mode @@ -131,7 +139,7 @@ def enable_assertions rescue StandardError => e warn e.message ensure - debug_server_on_realtime_failure + print_server_logs previous_url = current_url step %(I am authorized for the "Admin" section) visit previous_url @@ -169,7 +177,7 @@ def process_code_coverage After('@scope_cobbler') do |scenario| if scenario.failed? STDOUT.puts '=> /var/log/cobbler/cobbler.log' - out, _code = $server.run("tail -n20 /var/log/cobbler/cobbler.log") + out, _code = get_target('server').run("tail -n20 /var/log/cobbler/cobbler.log") out.each_line do |line| STDOUT.puts line.to_s end @@ -192,19 +200,19 @@ def process_code_coverage # do some tests only if the corresponding node exists Before('@proxy') do - skip_this_scenario unless $proxy + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['proxy'] end Before('@sle_minion') do - skip_this_scenario unless $minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle_minion'] end Before('@rhlike_minion') do - skip_this_scenario unless $rhlike_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rhlike_minion'] end Before('@deblike_minion') do - skip_this_scenario unless $deblike_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['deblike_minion'] end Before('@pxeboot_minion') do @@ -212,183 +220,183 @@ def process_code_coverage end Before('@ssh_minion') do - skip_this_scenario unless $ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ssh_minion'] end Before('@buildhost') do - skip_this_scenario unless $build_host + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['build_host'] end Before('@virthost_kvm') do - skip_this_scenario unless $kvm_server + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['kvm_server'] end Before('@alma9_minion') do - skip_this_scenario unless $alma9_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['alma9_minion'] end Before('@alma9_ssh_minion') do - skip_this_scenario unless $alma9_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['alma9_ssh_minion'] end Before('@centos7_minion') do - skip_this_scenario unless $centos7_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['centos7_minion'] end Before('@centos7_ssh_minion') do - skip_this_scenario unless $centos7_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['centos7_ssh_minion'] end Before('@liberty9_minion') do - skip_this_scenario unless $liberty9_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['liberty9_minion'] end Before('@liberty9_ssh_minion') do - skip_this_scenario unless $liberty9_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['liberty9_ssh_minion'] end Before('@oracle9_minion') do - skip_this_scenario unless $oracle9_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['oracle9_minion'] end Before('@oracle9_ssh_minion') do - skip_this_scenario unless $oracle9_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['oracle9_ssh_minion'] end Before('@rhel9_minion') do - skip_this_scenario unless $rhel9_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rhel9_minion'] end Before('@rhel9_ssh_minion') do - skip_this_scenario unless $rhel9_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rhel9_ssh_minion'] end Before('@rocky8_minion') do - skip_this_scenario unless $rocky8_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rocky8_minion'] end Before('@rocky8_ssh_minion') do - skip_this_scenario unless $rocky8_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rocky8_ssh_minion'] end Before('@rocky9_minion') do - skip_this_scenario unless $rocky9_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rocky9_minion'] end Before('@rocky9_ssh_minion') do - skip_this_scenario unless $rocky9_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['rocky9_ssh_minion'] end Before('@ubuntu1804_minion') do - skip_this_scenario unless $ubuntu1804_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu1804_minion'] end Before('@ubuntu1804_ssh_minion') do - skip_this_scenario unless $ubuntu1804_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu1804_ssh_minion'] end Before('@ubuntu2004_minion') do - skip_this_scenario unless $ubuntu2004_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu2004_minion'] end Before('@ubuntu2004_ssh_minion') do - skip_this_scenario unless $ubuntu2004_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu2004_ssh_minion'] end Before('@ubuntu2204_minion') do - skip_this_scenario unless $ubuntu2204_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu2204_minion'] end Before('@ubuntu2204_ssh_minion') do - skip_this_scenario unless $ubuntu2204_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['ubuntu2204_ssh_minion'] end Before('@debian10_minion') do - skip_this_scenario unless $debian10_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian10_minion'] end Before('@debian10_ssh_minion') do - skip_this_scenario unless $debian10_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian10_ssh_minion'] end Before('@debian11_minion') do - skip_this_scenario unless $debian11_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian11_minion'] end Before('@debian11_ssh_minion') do - skip_this_scenario unless $debian11_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['debian11_ssh_minion'] end Before('@sle12sp4_minion') do - skip_this_scenario unless $sle12sp4_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle12sp4_minion'] end Before('@sle12sp4_ssh_minion') do - skip_this_scenario unless $sle12sp4_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle12sp4_ssh_minion'] end Before('@sle12sp5_minion') do - skip_this_scenario unless $sle12sp5_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle12sp5_minion'] end Before('@sle12sp5_ssh_minion') do - skip_this_scenario unless $sle12sp5_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle12sp5_ssh_minion'] end Before('@sle15sp1_minion') do - skip_this_scenario unless $sle15sp1_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp1_minion'] end Before('@sle15sp1_ssh_minion') do - skip_this_scenario unless $sle15sp1_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp1_ssh_minion'] end Before('@sle15sp2_minion') do - skip_this_scenario unless $sle15sp2_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp2_minion'] end Before('@sle15sp2_ssh_minion') do - skip_this_scenario unless $sle15sp2_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp2_ssh_minion'] end Before('@sle15sp3_minion') do - skip_this_scenario unless $sle15sp3_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp3_minion'] end Before('@sle15sp3_ssh_minion') do - skip_this_scenario unless $sle15sp3_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp3_ssh_minion'] end Before('@sle15sp4_minion') do - skip_this_scenario unless $sle15sp4_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp4_minion'] end Before('@sle15sp4_ssh_minion') do - skip_this_scenario unless $sle15sp4_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp4_ssh_minion'] end Before('@sle15sp5_minion') do - skip_this_scenario unless $sle15sp5_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp5_minion'] end Before('@sle15sp5_ssh_minion') do - skip_this_scenario unless $sle15sp5_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp5_ssh_minion'] end Before('@opensuse154arm_minion') do - skip_this_scenario unless $opensuse154arm_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['opensuse154arm_minion'] end Before('@opensuse154arm_ssh_minion') do - skip_this_scenario unless $opensuse154arm_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['opensuse154arm_ssh_minion'] end Before('@opensuse155arm_minion') do - skip_this_scenario unless $opensuse155arm_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['opensuse155arm_minion'] end Before('@opensuse155arm_ssh_minion') do - skip_this_scenario unless $opensuse155arm_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['opensuse155arm_ssh_minion'] end Before('@slemicro') do |scenario| @@ -396,39 +404,39 @@ def process_code_coverage end Before('@slemicro51_minion') do - skip_this_scenario unless $slemicro51_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro51_minion'] end Before('@slemicro51_ssh_minion') do - skip_this_scenario unless $slemicro51_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro51_ssh_minion'] end Before('@slemicro52_minion') do - skip_this_scenario unless $slemicro52_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro52_minion'] end Before('@slemicro52_ssh_minion') do - skip_this_scenario unless $slemicro52_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro52_ssh_minion'] end Before('@slemicro53_minion') do - skip_this_scenario unless $slemicro53_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro53_minion'] end Before('@slemicro53_ssh_minion') do - skip_this_scenario unless $slemicro53_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro53_ssh_minion'] end Before('@slemicro54_minion') do - skip_this_scenario unless $slemicro54_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro54_minion'] end Before('@slemicro54_ssh_minion') do - skip_this_scenario unless $slemicro54_ssh_minion + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['slemicro54_ssh_minion'] end Before('@sle12sp5_buildhost') do - skip_this_scenario unless $sle12sp5_buildhost + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle12sp5_buildhost'] end Before('@sle12sp5_terminal') do @@ -436,11 +444,11 @@ def process_code_coverage end Before('@sle15sp4_buildhost') do - skip_this_scenario unless $sle15sp4_buildhost + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['sle15sp4_buildhost'] end Before('@monitoring_server') do - skip_this_scenario unless $monitoring_server + skip_this_scenario unless ENV.key? ENV_VAR_BY_HOST['monitoring_server'] end Before('@sle15sp4_terminal') do @@ -464,11 +472,11 @@ def process_code_coverage # TODO: remove these 2 "skip" tags when Rocky and Alma have patches available. Before('@skip_for_alma9') do - skip_this_scenario if $alma9_minion || $alma9_ssh_minion + skip_this_scenario if ENV.key?(ENV_VAR_BY_HOST['alma9_minion']) || ENV.key?(ENV_VAR_BY_HOST['alma9_ssh_minion']) end Before('@skip_for_rocky9') do - skip_this_scenario if $rocky9_minion || $rocky_ssh_minion + skip_this_scenario if ENV.key?(ENV_VAR_BY_HOST['rocky9_minion']) || ENV.key?(ENV_VAR_BY_HOST['rocky_ssh_minion']) end Before('@skip_for_sle_micro') do |scenario| @@ -492,22 +500,22 @@ def process_code_coverage # do some tests only if the server is using SUSE Manager Before('@susemanager') do - skip_this_scenario unless $product == 'SUSE Manager' + skip_this_scenario unless product == 'SUSE Manager' end # do some tests only if the server is using Uyuni Before('@uyuni') do - skip_this_scenario unless $product == 'Uyuni' + skip_this_scenario unless product == 'Uyuni' end # do some tests only if we are using salt bundle Before('@salt_bundle') do - skip_this_scenario unless $use_salt_bundle + skip_this_scenario unless use_salt_bundle end # do some tests only if we are using salt bundle Before('@skip_if_salt_bundle') do - skip_this_scenario if $use_salt_bundle + skip_this_scenario if use_salt_bundle end # do test only if HTTP proxy for Uyuni is defined @@ -546,15 +554,15 @@ def process_code_coverage end # have more infos about the errors -def debug_server_on_realtime_failure +def print_server_logs STDOUT.puts '=> /var/log/rhn/rhn_web_ui.log' - out, _code = $server.run("tail -n20 /var/log/rhn/rhn_web_ui.log | awk -v limit=\"$(date --date='5 minutes ago' '+%Y-%m-%d %H:%M:%S')\" ' $0 > limit'") + out, _code = get_target('server').run("tail -n20 /var/log/rhn/rhn_web_ui.log | awk -v limit=\"$(date --date='5 minutes ago' '+%Y-%m-%d %H:%M:%S')\" ' $0 > limit'") out.each_line do |line| STDOUT.puts line.to_s end STDOUT.puts STDOUT.puts '=> /var/log/rhn/rhn_web_api.log' - out, _code = $server.run("tail -n20 /var/log/rhn/rhn_web_api.log | awk -v limit=\"$(date --date='5 minutes ago' '+%Y-%m-%d %H:%M:%S')\" ' $0 > limit'") + out, _code = get_target('server').run("tail -n20 /var/log/rhn/rhn_web_api.log | awk -v limit=\"$(date --date='5 minutes ago' '+%Y-%m-%d %H:%M:%S')\" ' $0 > limit'") out.each_line do |line| STDOUT.puts line.to_s end diff --git a/testsuite/features/support/lavanda.rb b/testsuite/features/support/lavanda.rb index 732e2347b19c..64ca455ab277 100644 --- a/testsuite/features/support/lavanda.rb +++ b/testsuite/features/support/lavanda.rb @@ -5,8 +5,8 @@ require 'timeout' # Extend the objects node VMs with useful methods needed for testsuite. -# All function added here will be available like $server.run -# or $minion.run_until_ok etc. +# All function added here will be available like get_target('server').run +# or get_target('sle_minion').run_until_ok etc. module LavandaBasic # init the hostnames, only one time def init_hostname(hostname) diff --git a/testsuite/features/support/namespaces/system.rb b/testsuite/features/support/namespaces/system.rb index 039fe17165ca..9fc541e9703f 100644 --- a/testsuite/features/support/namespaces/system.rb +++ b/testsuite/features/support/namespaces/system.rb @@ -72,10 +72,10 @@ def list_latest_upgradable_packages(server) # activation_key: The activation key to use for the system. # salt_ssh: Boolean value determining if the system is SSH managed or not. def bootstrap_system(host, activation_key, salt_ssh) - if $proxy.nil? + if get_target('proxy').nil? @test.call('system.bootstrap', sessionKey: @test.token, host: host, sshPort: 22, sshUser: 'root', sshPassword: 'linux', activationKey: activation_key, saltSSH: salt_ssh) else - proxy = @test.call('system.searchByName', sessionKey: @test.token, regexp: $proxy.full_hostname) + proxy = @test.call('system.searchByName', sessionKey: @test.token, regexp: get_target('proxy').full_hostname) proxy_id = proxy.map { |s| s['id'] }.first @test.call('system.bootstrap', sessionKey: @test.token, host: host, sshPort: 22, sshUser: 'root', sshPassword: 'linux', activationKey: activation_key, proxyId: proxy_id, saltSSH: salt_ssh) end diff --git a/testsuite/features/support/twopence_env.rb b/testsuite/features/support/twopence_env.rb new file mode 100644 index 000000000000..aeb417e4f3a0 --- /dev/null +++ b/testsuite/features/support/twopence_env.rb @@ -0,0 +1,43 @@ +# Copyright (c) 2016-2023 SUSE LLC. +# Licensed under the terms of the MIT license. + +require 'require_all' +require 'twopence' +require_all 'features/support' + +# Raise a warning if any of these environment variables is missing +raise 'Server IP address or domain name variable empty' if ENV['SERVER'].nil? + +warn 'Proxy IP address or domain name variable empty' if ENV['PROXY'].nil? +unless $build_validation + warn 'Minion IP address or domain name variable empty' if ENV['MINION'].nil? + warn 'Buildhost IP address or domain name variable empty' if ENV['BUILD_HOST'].nil? + warn 'Red Hat-like minion IP address or domain name variable empty' if ENV['RHLIKE_MINION'].nil? + warn 'Debian-like minion IP address or domain name variable empty' if ENV['DEBLIKE_MINION'].nil? + warn 'SSH minion IP address or domain name variable empty' if ENV['SSH_MINION'].nil? + warn 'PXE boot MAC address variable empty' if ENV['PXEBOOT_MAC'].nil? + warn 'KVM server minion IP address or domain name variable empty' if ENV['VIRTHOST_KVM_URL'].nil? + warn 'Nested VM hostname empty' if ENV['MIN_NESTED'].nil? + warn 'Nested VM MAC address empty' if ENV['MAC_MIN_NESTED'].nil? +end + +# Dictionaries to obtain host or node from the Twopence objects +$nodes = [] +$node_by_host = {} +$host_by_node = {} + +# Preserve FQDN before initialization +$named_nodes = {} + +# Define SCC credentials through the environment variable +if ENV['SCC_CREDENTIALS'] + scc_username, scc_password = ENV['SCC_CREDENTIALS'].split('|') + $scc_credentials = !scc_username.to_s.empty? && !scc_password.to_s.empty? +end + +# Get the Twopence node passing the host (includes lazy initialization) +def get_target(host) + node = $node_by_host[host] + node = twopence_init(host) if node.nil? + node +end diff --git a/testsuite/features/support/twopence_init.rb b/testsuite/features/support/twopence_init.rb index 611eb0b6c9d0..006bc8e9a888 100644 --- a/testsuite/features/support/twopence_init.rb +++ b/testsuite/features/support/twopence_init.rb @@ -1,366 +1,19 @@ # Copyright (c) 2016-2023 SUSE LLC. # Licensed under the terms of the MIT license. -require 'require_all' require 'twopence' -require_all 'features/support' -# Initialize SSH targets from environment variables -raise 'Server IP address or domain name variable empty' if ENV['SERVER'].nil? -warn 'Proxy IP address or domain name variable empty' if ENV['PROXY'].nil? -unless $build_validation - warn 'Minion IP address or domain name variable empty' if ENV['MINION'].nil? - warn 'Buildhost IP address or domain name variable empty' if ENV['BUILD_HOST'].nil? - warn 'Red Hat-like minion IP address or domain name variable empty' if ENV['RHLIKE_MINION'].nil? - warn 'Debian-like minion IP address or domain name variable empty' if ENV['DEBLIKE_MINION'].nil? - warn 'SSH minion IP address or domain name variable empty' if ENV['SSH_MINION'].nil? - warn 'PXE boot MAC address variable empty' if ENV['PXEBOOT_MAC'].nil? - warn 'KVM server minion IP address or domain name variable empty' if ENV['VIRTHOST_KVM_URL'].nil? - warn 'Nested VM hostname empty' if ENV['MIN_NESTED'].nil? - warn 'Nested VM MAC address empty' if ENV['MAC_MIN_NESTED'].nil? -end - -# Preserve FQDN before initialization -$named_nodes = {} - -def twopence_init(target) - init_target = Twopence.init(target) - $named_nodes[init_target.hash] = target.split(':')[1] - init_target -end - -# Define common twopence objects -$localhost = twopence_init("ssh:#{ENV['HOSTNAME']}") unless $debug_mode -$proxy = twopence_init("ssh:#{ENV['PROXY']}") if ENV['PROXY'] -$server = twopence_init("ssh:#{ENV['SERVER']}") -$kvm_server = twopence_init("ssh:#{ENV['VIRTHOST_KVM_URL']}") if ENV['VIRTHOST_KVM_URL'] && ENV['VIRTHOST_KVM_PASSWORD'] - -$nodes = [$localhost, $server, $proxy, $kvm_server] - -if $build_validation - # Define twopence objects for Build Validation environment - $sle12sp4_minion = twopence_init("ssh:#{ENV['SLE12SP4_MINION']}") if ENV['SLE12SP4_MINION'] - $sle12sp4_ssh_minion = twopence_init("ssh:#{ENV['SLE12SP4_SSHMINION']}") if ENV['SLE12SP4_SSHMINION'] - $sle12sp5_minion = twopence_init("ssh:#{ENV['SLE12SP5_MINION']}") if ENV['SLE12SP5_MINION'] - $sle12sp5_ssh_minion = twopence_init("ssh:#{ENV['SLE12SP5_SSHMINION']}") if ENV['SLE12SP5_SSHMINION'] - $sle15sp1_minion = twopence_init("ssh:#{ENV['SLE15SP1_MINION']}") if ENV['SLE15SP1_MINION'] - $sle15sp1_ssh_minion = twopence_init("ssh:#{ENV['SLE15SP1_SSHMINION']}") if ENV['SLE15SP1_SSHMINION'] - $sle15sp2_minion = twopence_init("ssh:#{ENV['SLE15SP2_MINION']}") if ENV['SLE15SP2_MINION'] - $sle15sp2_ssh_minion = twopence_init("ssh:#{ENV['SLE15SP2_SSHMINION']}") if ENV['SLE15SP2_SSHMINION'] - $sle15sp3_minion = twopence_init("ssh:#{ENV['SLE15SP3_MINION']}") if ENV['SLE15SP3_MINION'] - $sle15sp3_ssh_minion = twopence_init("ssh:#{ENV['SLE15SP3_SSHMINION']}") if ENV['SLE15SP3_SSHMINION'] - $sle15sp4_minion = twopence_init("ssh:#{ENV['SLE15SP4_MINION']}") if ENV['SLE15SP4_MINION'] - $sle15sp4_ssh_minion = twopence_init("ssh:#{ENV['SLE15SP4_SSHMINION']}") if ENV['SLE15SP4_SSHMINION'] - $sle15sp5_minion = twopence_init("ssh:#{ENV['SLE15SP5_MINION']}") if ENV['SLE15SP5_MINION'] - $sle15sp5_ssh_minion = twopence_init("ssh:#{ENV['SLE15SP5_SSHMINION']}") if ENV['SLE15SP5_SSHMINION'] - $slemicro51_minion = twopence_init("ssh:#{ENV['SLEMICRO51_MINION']}") if ENV['SLEMICRO51_MINION'] - $slemicro51_ssh_minion = twopence_init("ssh:#{ENV['SLEMICRO51_SSHMINION']}") if ENV['SLEMICRO51_SSHMINION'] - $slemicro52_minion = twopence_init("ssh:#{ENV['SLEMICRO52_MINION']}") if ENV['SLEMICRO52_MINION'] - $slemicro52_ssh_minion = twopence_init("ssh:#{ENV['SLEMICRO52_SSHMINION']}") if ENV['SLEMICRO52_SSHMINION'] - $slemicro53_minion = twopence_init("ssh:#{ENV['SLEMICRO53_MINION']}") if ENV['SLEMICRO53_MINION'] - $slemicro53_ssh_minion = twopence_init("ssh:#{ENV['SLEMICRO53_SSHMINION']}") if ENV['SLEMICRO53_SSHMINION'] - $slemicro54_minion = twopence_init("ssh:#{ENV['SLEMICRO54_MINION']}") if ENV['SLEMICRO54_MINION'] - $slemicro54_ssh_minion = twopence_init("ssh:#{ENV['SLEMICRO54_SSHMINION']}") if ENV['SLEMICRO54_SSHMINION'] - $alma9_minion = twopence_init("ssh:#{ENV['ALMA9_MINION']}") if ENV['ALMA9_MINION'] - $alma9_ssh_minion = twopence_init("ssh:#{ENV['ALMA9_SSHMINION']}") if ENV['ALMA9_SSHMINION'] - $centos7_minion = twopence_init("ssh:#{ENV['CENTOS7_MINION']}") if ENV['CENTOS7_MINION'] - $centos7_ssh_minion = twopence_init("ssh:#{ENV['CENTOS7_SSHMINION']}") if ENV['CENTOS7_SSHMINION'] - $liberty9_minion = twopence_init("ssh:#{ENV['LIBERTY9_MINION']}") if ENV['LIBERTY9_MINION'] - $liberty9_ssh_minion = twopence_init("ssh:#{ENV['LIBERTY9_SSHMINION']}") if ENV['LIBERTY9_SSHMINION'] - $oracle9_minion = twopence_init("ssh:#{ENV['ORACLE9_MINION']}") if ENV['ORACLE9_MINION'] - $oracle9_ssh_minion = twopence_init("ssh:#{ENV['ORACLE9_SSHMINION']}") if ENV['ORACLE9_SSHMINION'] - $rhel9_minion = twopence_init("ssh:#{ENV['RHEL9_MINION']}") if ENV['RHEL9_MINION'] - $rhel9_ssh_minion = twopence_init("ssh:#{ENV['RHEL9_SSHMINION']}") if ENV['RHEL9_SSHMINION'] - $rocky8_minion = twopence_init("ssh:#{ENV['ROCKY8_MINION']}") if ENV['ROCKY8_MINION'] - $rocky8_ssh_minion = twopence_init("ssh:#{ENV['ROCKY8_SSHMINION']}") if ENV['ROCKY8_SSHMINION'] - $rocky9_minion = twopence_init("ssh:#{ENV['ROCKY9_MINION']}") if ENV['ROCKY9_MINION'] - $rocky9_ssh_minion = twopence_init("ssh:#{ENV['ROCKY9_SSHMINION']}") if ENV['ROCKY9_SSHMINION'] - $ubuntu1804_minion = twopence_init("ssh:#{ENV['UBUNTU1804_MINION']}") if ENV['UBUNTU1804_MINION'] - $ubuntu1804_ssh_minion = twopence_init("ssh:#{ENV['UBUNTU1804_SSHMINION']}") if ENV['UBUNTU1804_SSHMINION'] - $ubuntu2004_minion = twopence_init("ssh:#{ENV['UBUNTU2004_MINION']}") if ENV['UBUNTU2004_MINION'] - $ubuntu2004_ssh_minion = twopence_init("ssh:#{ENV['UBUNTU2004_SSHMINION']}") if ENV['UBUNTU2004_SSHMINION'] - $ubuntu2204_minion = twopence_init("ssh:#{ENV['UBUNTU2204_MINION']}") if ENV['UBUNTU2204_MINION'] - $ubuntu2204_ssh_minion = twopence_init("ssh:#{ENV['UBUNTU2204_SSHMINION']}") if ENV['UBUNTU2204_SSHMINION'] - $debian10_minion = twopence_init("ssh:#{ENV['DEBIAN10_MINION']}") if ENV['DEBIAN10_MINION'] - $debian10_ssh_minion = twopence_init("ssh:#{ENV['DEBIAN10_SSHMINION']}") if ENV['DEBIAN10_SSHMINION'] - $debian11_minion = twopence_init("ssh:#{ENV['DEBIAN11_MINION']}") if ENV['DEBIAN11_MINION'] - $debian11_ssh_minion = twopence_init("ssh:#{ENV['DEBIAN11_SSHMINION']}") if ENV['DEBIAN11_SSHMINION'] - $opensuse154arm_minion = twopence_init("ssh:#{ENV['OPENSUSE154ARM_MINION']}") if ENV['OPENSUSE154ARM_MINION'] - $opensuse154arm_ssh_minion = twopence_init("ssh:#{ENV['OPENSUSE154ARM_SSHMINION']}") if ENV['OPENSUSE154ARM_SSHMINION'] - $opensuse155arm_minion = twopence_init("ssh:#{ENV['OPENSUSE155ARM_MINION']}") if ENV['OPENSUSE155ARM_MINION'] - $opensuse155arm_ssh_minion = twopence_init("ssh:#{ENV['OPENSUSE155ARM_SSHMINION']}") if ENV['OPENSUSE155ARM_SSHMINION'] - $sle12sp5_buildhost = twopence_init("ssh:#{ENV['SLE12SP5_BUILDHOST']}") if ENV['SLE12SP5_BUILDHOST'] - $sle15sp4_buildhost = twopence_init("ssh:#{ENV['SLE15SP4_BUILDHOST']}") if ENV['SLE15SP4_BUILDHOST'] - $monitoring_server = twopence_init("ssh:#{ENV['MONITORING_SERVER']}") if ENV['MONITORING_SERVER'] - $nodes += [$sle12sp4_minion, $sle12sp4_ssh_minion, - $sle12sp5_minion, $sle12sp5_ssh_minion, - $sle15sp1_minion, $sle15sp1_ssh_minion, - $sle15sp2_minion, $sle15sp2_ssh_minion, - $sle15sp3_minion, $sle15sp3_ssh_minion, - $sle15sp4_minion, $sle15sp4_ssh_minion, - $sle15sp5_minion, $sle15sp5_ssh_minion, - $slemicro51_minion, $slemicro51_ssh_minion, - $slemicro52_minion, $slemicro52_ssh_minion, - $slemicro53_minion, $slemicro53_ssh_minion, - $slemicro54_minion, $slemicro54_ssh_minion, - $alma9_minion, $alma9_ssh_minion, - $centos7_minion, $centos7_ssh_minion, - $liberty9_minion, $liberty9_ssh_minion, - $oracle9_minion, $oracle9_ssh_minion, - $rhel9_minion, $rhel9_ssh_minion, - $rocky8_minion, $rocky8_ssh_minion, - $rocky9_minion, $rocky9_ssh_minion, - $ubuntu1804_minion, $ubuntu1804_ssh_minion, - $ubuntu2004_minion, $ubuntu2004_ssh_minion, - $ubuntu2204_minion, $ubuntu2204_ssh_minion, - $debian10_minion, $debian10_ssh_minion, - $debian11_minion, $debian11_ssh_minion, - $opensuse154arm_minion, $opensuse154arm_ssh_minion, - $opensuse155arm_minion, $opensuse155arm_ssh_minion, - $sle12sp5_buildhost, - $sle15sp4_buildhost, - $monitoring_server] -else - # Define twopence objects for QA environment - $minion = twopence_init("ssh:#{ENV['MINION']}") if ENV['MINION'] - $ssh_minion = twopence_init("ssh:#{ENV['SSH_MINION']}") if ENV['SSH_MINION'] - $rhlike_minion = twopence_init("ssh:#{ENV['RHLIKE_MINION']}") if ENV['RHLIKE_MINION'] - $deblike_minion = twopence_init("ssh:#{ENV['DEBLIKE_MINION']}") if ENV['DEBLIKE_MINION'] - $build_host = twopence_init("ssh:#{ENV['BUILD_HOST']}") if ENV['BUILD_HOST'] - $salt_migration_minion = twopence_init("ssh:#{ENV['MIN_NESTED']}") if ENV['MIN_NESTED'] - $nodes += [$minion, $ssh_minion, $rhlike_minion, $deblike_minion, $build_host, $salt_migration_minion] -end - -# Lavanda library module extension -# Look at support/lavanda.rb for more details -$nodes.each do |node| - next if node.nil? - - node.extend(LavandaBasic) -end - -# Initialize hostname -$nodes.each do |node| - next if node.nil? - - hostname, local, remote, code = node.test_and_store_results_together('hostname', 'root', 500) - # special handling for nested VMs since they will only be crated later in the test suite - # we to a late hostname initialization in a special step for those - next if hostname.empty? || node == $salt_migration_minion - - raise "Cannot connect to get hostname for '#{$named_nodes[node.hash]}'. Response code: #{code}, local: #{local}, remote: #{remote}" if code.nonzero? || remote.nonzero? || local.nonzero? - raise "No hostname for '#{$named_nodes[node.hash]}'. Response code: #{code}" if hostname.empty? - node.init_hostname(hostname) - - fqdn, local, remote, code = node.test_and_store_results_together('hostname -f', 'root', 500) - raise "Cannot connect to get FQDN for '#{$named_nodes[node.hash]}'. Response code: #{code}, local: #{local}, remote: #{remote}" if code.nonzero? || remote.nonzero? || local.nonzero? - raise "No FQDN for '#{$named_nodes[node.hash]}'. Response code: #{code}" if fqdn.empty? - node.init_full_hostname(fqdn) - - STDOUT.puts "Host '#{$named_nodes[node.hash]}' is alive with determined hostname #{hostname.strip} and FQDN #{fqdn.strip}" unless $build_validation +# Retrieve and set OS Family and Version of a node +def process_os_family_and_version(host, fqdn, hostname, node) + STDOUT.puts "Host '#{host}' is alive with determined hostname #{hostname.strip} and FQDN #{fqdn.strip}" unless $build_validation os_version, os_family = get_os_version(node) node.init_os_family(os_family) node.init_os_version(os_version) -end - -# This function is used to get one of the nodes based on its type -def get_target(host) - node = $node_by_host[host] - raise 'Invalid target' if node.nil? node end -# This function gets the system name, as displayed in systems list -# * for the usual clients, it is the full hostname, e.g. suma-41-min-sle15.tf.local -# * for the PXE booted clients, it is derived from the branch name, the hardware type, -# and a fingerprint, e.g. example.Intel-Genuine-None-d6df84cca6f478cdafe824e35bbb6e3b -def get_system_name(host) - case host - # The PXE boot minion and the terminals are not directly accessible on the network, - # therefore they are not represented by a twopence node - when 'pxeboot_minion' - output, _code = $server.run('salt-key') - system_name = output.split.find do |word| - word =~ /example.Intel-Genuine-None-/ || word =~ /example.pxeboot-/ || word =~ /example.Intel/ || word =~ /pxeboot-/ - end - system_name = 'pxeboot.example.org' if system_name.nil? - when 'sle12sp5_terminal' - output, _code = $server.run('salt-key') - system_name = output.split.find do |word| - word =~ /example.sle12sp5terminal-/ - end - system_name = 'sle12sp5terminal.example.org' if system_name.nil? - when 'sle15sp4_terminal' - output, _code = $server.run('salt-key') - system_name = output.split.find do |word| - word =~ /example.sle15sp4terminal-/ - end - system_name = 'sle15sp4terminal.example.org' if system_name.nil? - when 'containerized_proxy' - system_name = $proxy.full_hostname.sub('pxy', 'pod-pxy') - else - begin - node = get_target(host) - system_name = node.full_hostname - rescue RuntimeError - # If the node for that host is not defined, just return the host parameter as system_name - system_name = host - end - end - system_name -end - -# Get MAC address of system -def get_mac_address(host) - if host == 'pxeboot_minion' - mac = ENV['PXEBOOT_MAC'] - else - node = get_target(host) - output, _code = node.run('ip link show dev eth1') - mac = output.split("\n")[1].split[1] - end - mac -end - -# This function returns the net prefix, caching it -def net_prefix - $net_prefix = $private_net.sub(%r{\.0+/24$}, '.') if $net_prefix.nil? && !$private_net.nil? - $net_prefix -end - -# This function tests whether a file exists on a node -def file_exists?(node, file) - _out, local, _remote, code = node.test_and_store_results_together("test -f #{file}", 'root', 500) - code.zero? && local.zero? -end - -# This function tests whether a folder exists on a node -def folder_exists?(node, file) - _out, local, _remote, code = node.test_and_store_results_together("test -d #{file}", 'root', 500) - code.zero? && local.zero? -end - -# This function deletes a file from a node -def file_delete(node, file) - _out, _local, _remote, code = node.test_and_store_results_together("rm #{file}", 'root', 500) - code -end - -# This function deletes a file from a node -def folder_delete(node, folder) - _out, _local, _remote, code = node.test_and_store_results_together("rm -rf #{folder}", 'root', 500) - code -end - -# This function extracts a file from a node -def file_extract(node, remote_file, local_file) - code, _remote = node.extract_file(remote_file, local_file, 'root', false) - code -end - -# This function injects a file into a node -def file_inject(node, local_file, remote_file) - code, _remote = node.inject_file(local_file, remote_file, 'root', false) - code -end - -# Other global variables -$product = product -$product_version = product_version -$use_salt_bundle = use_salt_bundle -$pxeboot_mac = ENV['PXEBOOT_MAC'] -$pxeboot_image = ENV['PXEBOOT_IMAGE'] || 'sles15sp3o' -$sle12sp5_terminal_mac = ENV['SLE12SP5_TERMINAL_MAC'] -$sle15sp4_terminal_mac = ENV['SLE15SP4_TERMINAL_MAC'] -$private_net = ENV['PRIVATENET'] if ENV['PRIVATENET'] -$mirror = ENV['MIRROR'] -$server_http_proxy = ENV['SERVER_HTTP_PROXY'] if ENV['SERVER_HTTP_PROXY'] -$custom_download_endpoint = ENV['CUSTOM_DOWNLOAD_ENDPOINT'] if ENV['CUSTOM_DOWNLOAD_ENDPOINT'] -$no_auth_registry = ENV['NO_AUTH_REGISTRY'] if ENV['NO_AUTH_REGISTRY'] -$auth_registry = ENV['AUTH_REGISTRY'] if ENV['AUTH_REGISTRY'] -if ENV['SCC_CREDENTIALS'] - scc_username, scc_password = ENV['SCC_CREDENTIALS'].split('|') - $scc_credentials = !scc_username.to_s.empty? && !scc_password.to_s.empty? -end -$node_by_host = { 'localhost' => $localhost, - 'server' => $server, - 'proxy' => $proxy, - 'containerized_proxy' => $proxy, - 'sle_minion' => $minion, - 'ssh_minion' => $ssh_minion, - 'rhlike_minion' => $rhlike_minion, - 'deblike_minion' => $deblike_minion, - 'build_host' => $build_host, - 'kvm_server' => $kvm_server, - 'sle12sp4_minion' => $sle12sp4_minion, - 'sle12sp4_ssh_minion' => $sle12sp4_ssh_minion, - 'sle12sp5_minion' => $sle12sp5_minion, - 'sle12sp5_ssh_minion' => $sle12sp5_ssh_minion, - 'sle15sp1_minion' => $sle15sp1_minion, - 'sle15sp1_ssh_minion' => $sle15sp1_ssh_minion, - 'sle15sp2_minion' => $sle15sp2_minion, - 'sle15sp2_ssh_minion' => $sle15sp2_ssh_minion, - 'sle15sp3_minion' => $sle15sp3_minion, - 'sle15sp3_ssh_minion' => $sle15sp3_ssh_minion, - 'sle15sp4_minion' => $sle15sp4_minion, - 'sle15sp4_ssh_minion' => $sle15sp4_ssh_minion, - 'sle15sp5_minion' => $sle15sp5_minion, - 'sle15sp5_ssh_minion' => $sle15sp5_ssh_minion, - 'slemicro51_minion' => $slemicro51_minion, - 'slemicro51_ssh_minion' => $slemicro51_ssh_minion, - 'slemicro52_minion' => $slemicro52_minion, - 'slemicro52_ssh_minion' => $slemicro52_ssh_minion, - 'slemicro53_minion' => $slemicro53_minion, - 'slemicro53_ssh_minion' => $slemicro53_ssh_minion, - 'slemicro54_minion' => $slemicro54_minion, - 'slemicro54_ssh_minion' => $slemicro54_ssh_minion, - 'alma9_minion' => $alma9_minion, - 'alma9_ssh_minion' => $alma9_ssh_minion, - 'centos7_minion' => $centos7_minion, - 'centos7_ssh_minion' => $centos7_ssh_minion, - 'liberty9_minion' => $liberty9_minion, - 'liberty9_ssh_minion' => $liberty9_ssh_minion, - 'oracle9_minion' => $oracle9_minion, - 'oracle9_ssh_minion' => $oracle9_ssh_minion, - 'rhel9_minion' => $rhel9_minion, - 'rhel9_ssh_minion' => $rhel9_ssh_minion, - 'rocky8_minion' => $rocky8_minion, - 'rocky8_ssh_minion' => $rocky8_ssh_minion, - 'rocky9_minion' => $rocky9_minion, - 'rocky9_ssh_minion' => $rocky9_ssh_minion, - 'ubuntu1804_minion' => $ubuntu1804_minion, - 'ubuntu1804_ssh_minion' => $ubuntu1804_ssh_minion, - 'ubuntu2004_minion' => $ubuntu2004_minion, - 'ubuntu2004_ssh_minion' => $ubuntu2004_ssh_minion, - 'ubuntu2204_minion' => $ubuntu2204_minion, - 'ubuntu2204_ssh_minion' => $ubuntu2204_ssh_minion, - 'debian10_minion' => $debian10_minion, - 'debian10_ssh_minion' => $debian10_ssh_minion, - 'debian11_minion' => $debian11_minion, - 'debian11_ssh_minion' => $debian11_ssh_minion, - 'opensuse154arm_minion' => $opensuse154arm_minion, - 'opensuse154arm_ssh_minion' => $opensuse154arm_ssh_minion, - 'opensuse155arm_minion' => $opensuse155arm_minion, - 'opensuse155arm_ssh_minion' => $opensuse155arm_ssh_minion, - 'sle12sp5_buildhost' => $sle12sp5_buildhost, - 'sle15sp4_buildhost' => $sle15sp4_buildhost, - 'monitoring_server' => $monitoring_server, - 'salt_migration_minion' => $salt_migration_minion } - -# This is the inverse of `node_by_host`. -$host_by_node = {} -$node_by_host.each do |host, node| - next if node.nil? - - [host, node].each do |it| - raise ">>> Either host '#{host}' of node '#{node}' is empty. Please check" if it == '' - end - - $host_by_node[node] = host -end - -def client_public_ip(host) - node = $node_by_host[host] +# Obtain the Public IP for a node +def client_public_ip(node) raise "Cannot resolve node for host '#{host}'" if node.nil? %w[br0 eth0 eth1 ens0 ens1 ens2 ens3 ens4 ens5 ens6].each do |dev| @@ -369,25 +22,58 @@ def client_public_ip(host) node.init_public_interface(dev) return '' if output.empty? + return output.split[1].split('/')[0] end raise "Cannot resolve public ip of #{host}" end -# Initialize IP address or domain name -$nodes.each do |node| - next if node.nil? - next if node.is_a?(String) && node.empty? - - host = $host_by_node[node] - raise "Cannot resolve host for node: '#{node.hostname}'" if host.nil? || host == '' - +# Retrieve and set private and public IPs of a node +def process_private_and_public_ip(host, node) if (ADDRESSES.key? host) && !$private_net.nil? node.init_private_ip(net_prefix + ADDRESSES[host]) node.init_private_interface('eth1') end - ip = client_public_ip host - next if ip.empty? - node.init_public_ip ip + ip = client_public_ip node + node.init_public_ip(ip) unless ip.empty? + node +end + +# Initialize a Twopence node through its host (additionally it will setup some handy maps) +def twopence_init(host) + puts "Initializing a twopence node for '#{host}'." + target = "ssh:#{ENV[ENV_VAR_BY_HOST[host]]}" + node = Twopence.init(target) + raise "Twopence node #{host} initialization has failed." if node.nil? + + $named_nodes[node.hash] = target.split(':')[1] + + # Lavanda library module extension + # Look at support/lavanda.rb for more details + node.extend(LavandaBasic) + + # Initialize hostname + hostname, local, remote, code = node.test_and_store_results_together('hostname', 'root', 500) + + # special handling for nested VMs since they will only be created later in the test suite + # we to a late hostname initialization in a special step for those + unless hostname.empty? || host == 'salt_migration_minion' + raise "Cannot connect to get hostname for '#{$named_nodes[node.hash]}'. Response code: #{code}, local: #{local}, remote: #{remote}" if code.nonzero? || remote.nonzero? || local.nonzero? + raise "No hostname for '#{$named_nodes[node.hash]}'. Response code: #{code}" if hostname.empty? + node.init_hostname(hostname) + + fqdn, local, remote, code = node.test_and_store_results_together('hostname -f', 'root', 500) + raise "Cannot connect to get FQDN for '#{$named_nodes[node.hash]}'. Response code: #{code}, local: #{local}, remote: #{remote}" if code.nonzero? || remote.nonzero? || local.nonzero? + raise "No FQDN for '#{$named_nodes[node.hash]}'. Response code: #{code}" if fqdn.empty? + node.init_full_hostname(fqdn) + + node = process_os_family_and_version(host, fqdn, hostname, node) + node = process_private_and_public_ip(host, node) + end + + $nodes << node + $node_by_host[host] = node + $host_by_node[node] = host + node end From 55017a517fc27cb29ce1328d30ab8af1099db286 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 13:44:17 +0200 Subject: [PATCH 045/127] Revert "Testsuite: Replace steps that use systems filter to navigate to minions" (#7384) --- .../retail/sle12sp5_terminal_deploy.feature | 2 +- .../retail/sle15sp4_terminal_deploy.feature | 2 +- .../features/secondary/proxy_cobbler_pxeboot.feature | 2 +- .../proxy_retail_pxeboot_and_mass_import.feature | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature b/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature index f2a2ce9115a2..d788c358c2e6 100644 --- a/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature +++ b/testsuite/features/build_validation/retail/sle12sp5_terminal_deploy.feature @@ -27,7 +27,7 @@ Feature: PXE boot a SLES 12 SP5 retail terminal Then "sle12sp5_terminal" should have been reformatted Scenario: Check connection from SLES 12 SP5 retail terminal to branch server - Given I am on the Systems overview page of this "sle12sp5_terminal" + Given I navigate to the Systems overview page of this "sle12sp5_terminal" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature b/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature index 3daff2b67dd3..4b35e96ff32b 100644 --- a/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature +++ b/testsuite/features/build_validation/retail/sle15sp4_terminal_deploy.feature @@ -27,7 +27,7 @@ Feature: PXE boot a SLES 15 SP4 retail terminal Then "sle15sp4_terminal" should have been reformatted Scenario: Check connection from SLES 15 SP4 retail terminal to branch server - Given I am on the Systems overview page of this "sle15sp4_terminal" + Given I navigate to the Systems overview page of this "sle15sp4_terminal" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text diff --git a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature index 26c8a1580328..faafa7ee9810 100644 --- a/testsuite/features/secondary/proxy_cobbler_pxeboot.feature +++ b/testsuite/features/secondary/proxy_cobbler_pxeboot.feature @@ -143,7 +143,7 @@ Feature: PXE boot a terminal with Cobbler And I wait for "tftpboot-installation-SLE-15-SP4-x86_64" to be uninstalled on "server" Scenario: Cleanup: delete the PXE boot minion - Given I am on the Systems overview page of this "pxeboot_minion" + Given I navigate to the Systems overview page of this "pxeboot_minion" When I follow "Delete System" Then I should see a "Confirm System Profile Deletion" text When I click on "Delete Profile" diff --git a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature index 29c139da61f5..8665707af9d7 100644 --- a/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature +++ b/testsuite/features/secondary/proxy_retail_pxeboot_and_mass_import.feature @@ -205,13 +205,13 @@ Feature: PXE boot a Retail terminal Then "pxeboot_minion" should have been reformatted Scenario: Check connection from terminal to branch server - Given I am on the Systems overview page of this "pxeboot_minion" + Given I navigate to the Systems overview page of this "pxeboot_minion" When I follow "Details" in the content area And I follow "Connection" in the content area Then I should see a "proxy.example.org" text Scenario: Install a package on the new Retail terminal - Given I am on the Systems overview page of this "pxeboot_minion" + Given I navigate to the Systems overview page of this "pxeboot_minion" When I install the GPG key of the test packages repository on the PXE boot minion And I follow "Software" in the content area And I follow "Install" @@ -224,7 +224,7 @@ Feature: PXE boot a Retail terminal When I wait until event "Package Install/Upgrade scheduled by admin" is completed Scenario: Cleanup: remove a package on the new Retail terminal - Given I am on the Systems overview page of this "pxeboot_minion" + Given I navigate to the Systems overview page of this "pxeboot_minion" When I follow "Software" in the content area And I follow "List / Remove" And I enter "virgo" as the filtered package name @@ -236,7 +236,7 @@ Feature: PXE boot a Retail terminal When I wait until event "Package Removal scheduled by admin" is completed Scenario: Cleanup: delete the new Retail terminal - Given I am on the Systems overview page of this "pxeboot_minion" + Given I navigate to the Systems overview page of this "pxeboot_minion" When I follow "Delete System" Then I should see a "Confirm System Profile Deletion" text When I click on "Delete Profile" From f199d12b03fdba86a0d24098c7754c5b66834639 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Tue, 8 Aug 2023 13:46:39 +0200 Subject: [PATCH 046/127] QE: Fix `proxy_base_channel` selection (#7382) --- testsuite/features/support/constants.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb index 6158f678ceff..6bc86c2e4ba7 100644 --- a/testsuite/features/support/constants.rb +++ b/testsuite/features/support/constants.rb @@ -200,14 +200,14 @@ sle_base_channel = if $is_container_provider 'Fake Base Channel' - elsif $product == 'Uyuni' + elsif ENV['SERVER'].include? 'uyuni' 'openSUSE Leap 15.4 (x86_64)' else 'SLES15-SP4-Pool' end proxy_base_channel = - if $product == 'Uyuni' + if ENV['SERVER'].include? 'uyuni' 'openSUSE Leap 15.4 (x86_64)' else 'SLE-Product-SUSE-Manager-Proxy-4.3-Pool' From 9b95a811de4bbd3256d56b829f0bc7791906c09b Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Tue, 8 Aug 2023 14:00:47 +0200 Subject: [PATCH 047/127] CI: set mini_mime gem to specific version mini_mime > 1.1.2, requires ruby >= 2.6, but we have an older version of ruby. --- testsuite/Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testsuite/Gemfile b/testsuite/Gemfile index 53707340615a..ad9addf58340 100644 --- a/testsuite/Gemfile +++ b/testsuite/Gemfile @@ -13,6 +13,8 @@ gem 'rack-test', "~> 2.0" gem 'nokogiri', "~> 1.12.0" gem 'rake', "~> 13.0" gem 'jwt', "~> 2.6" +# mini-mime > 1.1.2, requires ruby 2.6 +gem 'mini-mime', '1.1.2' gem 'mime-types', "~> 3.4" gem 'xmlrpc', "~> 0.3" gem 'faraday', '1.10.0' From 65a5d3dd857c72523affb4b26f337213ba2fc5b8 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Tue, 8 Aug 2023 14:08:08 +0200 Subject: [PATCH 048/127] fix mini_mime gem name in Gemfile --- testsuite/Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/Gemfile b/testsuite/Gemfile index ad9addf58340..2935ba3be875 100644 --- a/testsuite/Gemfile +++ b/testsuite/Gemfile @@ -13,8 +13,8 @@ gem 'rack-test', "~> 2.0" gem 'nokogiri', "~> 1.12.0" gem 'rake', "~> 13.0" gem 'jwt', "~> 2.6" -# mini-mime > 1.1.2, requires ruby 2.6 -gem 'mini-mime', '1.1.2' +# mini_mime > 1.1.2, requires ruby 2.6 +gem 'mini_mime', '1.1.2' gem 'mime-types', "~> 3.4" gem 'xmlrpc', "~> 0.3" gem 'faraday', '1.10.0' From bf75b326ac5c45d4410f9e73e4e8add0fcd53695 Mon Sep 17 00:00:00 2001 From: Alexander Graul Date: Wed, 28 Jun 2023 13:35:54 +0200 Subject: [PATCH 049/127] Add cobbler collections to supportconfig We have been requesting the contents of /var/lib/cobbler/collections in many of the cobbler bugs in the last year. That's one round-trip we can save by collecting these JSON files upfront with the supportconfig plugin. --- python/spacewalk/satellite_tools/spacewalk-debug | 1 + ...k-backend.changes.agraul.supportutils-add-cobbler-collections | 1 + 2 files changed, 2 insertions(+) create mode 100644 python/spacewalk/spacewalk-backend.changes.agraul.supportutils-add-cobbler-collections diff --git a/python/spacewalk/satellite_tools/spacewalk-debug b/python/spacewalk/satellite_tools/spacewalk-debug index c5de37132557..9a7e4cd78894 100755 --- a/python/spacewalk/satellite_tools/spacewalk-debug +++ b/python/spacewalk/satellite_tools/spacewalk-debug @@ -261,6 +261,7 @@ if [ -d /var/lib/cobbler ]; then cp -fa /var/lib/cobbler/config $DIR/cobbler-lib/ cp -fa /var/lib/cobbler/kickstarts $DIR/cobbler-lib/ cp -fa /var/lib/cobbler/triggers $DIR/cobbler-lib/ + cp -fa /var/lib/cobbler/collections $DIR/cobbler-lib/ fi if [ -d /var/lib/rhn/kickstarts ]; then cp -fa /var/lib/rhn/kickstarts/* $DIR/kickstarts/ diff --git a/python/spacewalk/spacewalk-backend.changes.agraul.supportutils-add-cobbler-collections b/python/spacewalk/spacewalk-backend.changes.agraul.supportutils-add-cobbler-collections new file mode 100644 index 000000000000..5138505884cc --- /dev/null +++ b/python/spacewalk/spacewalk-backend.changes.agraul.supportutils-add-cobbler-collections @@ -0,0 +1 @@ +- Add cobbler collections to supportconfig From 15e1d5c40e3ad54a116800155dcbbe9852ca2837 Mon Sep 17 00:00:00 2001 From: Victor Zhestkov Date: Tue, 8 Aug 2023 15:34:46 +0200 Subject: [PATCH 050/127] Extend list errata names for servers for salt bundle (#7386) * Extend listErrataNamesForServers to consider salt bundle * Update changelog for consider salt bundle as salt update (bsc#1211884) --- .../src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml | 2 +- ...s.vzhestkov.extend-listErrataNamesForServers-for-salt-bundle | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 java/spacewalk-java.changes.vzhestkov.extend-listErrataNamesForServers-for-salt-bundle diff --git a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml index a906cdfb8801..2971c38d84ad 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/server/Server_legacyUser.hbm.xml @@ -515,7 +515,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" CASE WHEN (SELECT COUNT(*) FROM rhnErrataPackage k WHERE e.id = k.errata_id AND k.package_id IN (SELECT id FROM rhnPackage p WHERE p.name_id IN - (SELECT id FROM rhnPackageName pn WHERE pn.name = 'salt'))) > 0 + (SELECT id FROM rhnPackageName pn WHERE pn.name = 'salt' OR pn.name = 'venv-salt-minion'))) > 0 THEN 1 ELSE 0 END AS includeSalt diff --git a/java/spacewalk-java.changes.vzhestkov.extend-listErrataNamesForServers-for-salt-bundle b/java/spacewalk-java.changes.vzhestkov.extend-listErrataNamesForServers-for-salt-bundle new file mode 100644 index 000000000000..f5ed443fc3b5 --- /dev/null +++ b/java/spacewalk-java.changes.vzhestkov.extend-listErrataNamesForServers-for-salt-bundle @@ -0,0 +1,2 @@ +- Consider venv-salt-minion package update as salt update + to prevent backtraces on upgrading salt with itself (bsc#1211884) From 31614fa88b004cbc2d235e258a2393a103ac634e Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 15:39:43 +0200 Subject: [PATCH 051/127] Add system overview option for Uyuni (#7385) --- testsuite/features/step_definitions/navigation_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/step_definitions/navigation_steps.rb b/testsuite/features/step_definitions/navigation_steps.rb index c54027c376a2..0ae24fddf40d 100644 --- a/testsuite/features/step_definitions/navigation_steps.rb +++ b/testsuite/features/step_definitions/navigation_steps.rb @@ -110,7 +110,7 @@ end When(/^I wait until I see the name of "([^"]*)", refreshing the page$/) do |host| - raise 'Overview System page didn\'t load' unless has_content?('System Overview') + raise 'Overview System page didn\'t load' unless has_content?('System Overview') || has_content?('Systems') system_name = get_system_name(host) step %(I wait until I see the "#{system_name}" system, refreshing the page) end From c24e790832cae85af81b1d7fed80ae65ea7c78cb Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 16:06:37 +0200 Subject: [PATCH 052/127] Change references to checkboxes (#7359) --- testsuite/documentation/cucumber-steps.md | 2 +- .../features/init_clients/buildhost_bootstrap.feature | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testsuite/documentation/cucumber-steps.md b/testsuite/documentation/cucumber-steps.md index 6cab45721ef6..81752faa7fd3 100644 --- a/testsuite/documentation/cucumber-steps.md +++ b/testsuite/documentation/cucumber-steps.md @@ -292,7 +292,7 @@ The radio button can be identified by name, id or label text. ```gherkin When I check "manageWithSSH" When I uncheck "role_org_admin" - When I check "container_build_host" if not checked + When I check "Container Build Host" if not checked ``` The check box can be identified by name, id or label text. diff --git a/testsuite/features/init_clients/buildhost_bootstrap.feature b/testsuite/features/init_clients/buildhost_bootstrap.feature index 9ce14e158af5..9650f68ffbe3 100644 --- a/testsuite/features/init_clients/buildhost_bootstrap.feature +++ b/testsuite/features/init_clients/buildhost_bootstrap.feature @@ -11,8 +11,8 @@ Feature: Bootstrap a build host via the GUI When I follow the left menu "Systems > Activation Keys" And I follow "SUSE Test Key x86_64" in the content area And I wait until I see "Container Build Host" text - And I check "container_build_host" - And I check "osimage_build_host" + And I check "Container Build Host" + And I check "OS Image Build Host" And I click on "Update Activation Key" Scenario: Bootstrap a build host @@ -65,6 +65,6 @@ Feature: Bootstrap a build host via the GUI When I follow the left menu "Systems > Activation Keys" And I follow "SUSE Test Key x86_64" in the content area And I wait until I see "Container Build Host" text - And I uncheck "container_build_host" - And I uncheck "osimage_build_host" + And I uncheck "Container Build Host" + And I uncheck "OS Image Build Host" And I click on "Update Activation Key" From 8b111f4dbc37866a12e5c5240bbe40eb798fcc43 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 16:34:14 +0200 Subject: [PATCH 053/127] Testsuite: Correct omitted run method (#7390) * Replace missed occurence of server.run replacement * Fix typo --- testsuite/features/reposync/srv_sync_products.feature | 2 +- testsuite/features/reposync/srv_wait_for_reposync.feature | 2 +- testsuite/features/step_definitions/command_steps.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuite/features/reposync/srv_sync_products.feature b/testsuite/features/reposync/srv_sync_products.feature index 8d27cdf2e501..b9e45c7e4d73 100644 --- a/testsuite/features/reposync/srv_sync_products.feature +++ b/testsuite/features/reposync/srv_sync_products.feature @@ -63,7 +63,7 @@ Feature: Synchronize products in the products page of the Setup Wizard Then the SLE15 SP4 product should be added @uyuni - Scenario: Add openSUSE Leap 15.4 product, inlcuding Uyuni Client Tools + Scenario: Add openSUSE Leap 15.4 product, including Uyuni Client Tools When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-devel-leap opensuse_leap15_4-uyuni-client" with arch "x86_64" @proxy diff --git a/testsuite/features/reposync/srv_wait_for_reposync.feature b/testsuite/features/reposync/srv_wait_for_reposync.feature index 7e8e419ed570..c85c86e77fe9 100644 --- a/testsuite/features/reposync/srv_wait_for_reposync.feature +++ b/testsuite/features/reposync/srv_wait_for_reposync.feature @@ -17,7 +17,7 @@ Feature: Wait for reposync activity to finish in CI context When I kill all running spacewalk-repo-sync, excepted the ones needed to bootstrap @uyuni - Scenario: Sync openSUSE Leap 15.4 product, inlcuding Uyuni Client Tools + Scenario: Sync openSUSE Leap 15.4 product, including Uyuni Client Tools When I call spacewalk-repo-sync to sync the parent channel "opensuse_leap15_4-x86_64" Scenario: Wait until all synchronized channels have finished diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb index 2ac1a2adaa54..345be032ab2b 100644 --- a/testsuite/features/step_definitions/command_steps.rb +++ b/testsuite/features/step_definitions/command_steps.rb @@ -779,7 +779,7 @@ end When(/^I call spacewalk\-repo\-sync to sync the parent channel "(.*?)"$/) do |channel| - @command_output, _code = $server.run("spacewalk-repo-sync -p #{channel}", check_errors: false) + @command_output, _code = get_target('server').run("spacewalk-repo-sync -p #{channel}", check_errors: false) end When(/^I get "(.*?)" file details for channel "(.*?)" via spacecmd$/) do |arg1, arg2| From 74dca26c765df966812ff8e4e7e6aab7f233124b Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 18:08:28 +0200 Subject: [PATCH 054/127] Replace forgotten occurence of product variable (#7392) --- testsuite/features/support/commonlib.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb index 9d80cb3436d7..c67d1b2e1074 100644 --- a/testsuite/features/support/commonlib.rb +++ b/testsuite/features/support/commonlib.rb @@ -31,7 +31,7 @@ def generate_temp_file(name, content) def compute_channels_to_leave_running # keep the repos needed for the auto-installation tests do_not_kill = - if $product == 'Uyuni' + if product == 'Uyuni' CHANNEL_TO_SYNCH_BY_OS_VERSION['15.4'] else CHANNEL_TO_SYNCH_BY_OS_VERSION['default'] From 811c364dff641df9c0f58bb07a1c7f3265a75e06 Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Tue, 8 Aug 2023 18:15:29 +0200 Subject: [PATCH 055/127] We never selected test-net0, there's no reason it appears selected --- testsuite/features/secondary/minkvm_guests.feature | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testsuite/features/secondary/minkvm_guests.feature b/testsuite/features/secondary/minkvm_guests.feature index 47922e8a7e07..106fae0fa36c 100644 --- a/testsuite/features/secondary/minkvm_guests.feature +++ b/testsuite/features/secondary/minkvm_guests.feature @@ -10,7 +10,7 @@ @scope_virtualization @virthost_kvm @scope_cobbler -Feature: Be able to manage KVM virtual machines via the GUI +Feature: Manage KVM virtual machines via the GUI Scenario: Log in as admin user Given I am authorized for the "Admin" section @@ -66,7 +66,6 @@ Feature: Be able to manage KVM virtual machines via the GUI Then I should see "1024" in field identified by "memory" And I should see "1" in field identified by "vcpu" And option "VNC" is selected as "graphicsType" - And option "test-net0" is selected as "network0_source" And option "virtio" is selected as "disk0_bus" When I enter "512" as "memory" And I enter "2" as "vcpu" From 7155eb3b64efc2e646f974167dbe91c348426208 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Tue, 8 Aug 2023 22:15:30 +0200 Subject: [PATCH 056/127] Typo fix in retail_steps.rb (#7394) --- testsuite/features/step_definitions/retail_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/step_definitions/retail_steps.rb b/testsuite/features/step_definitions/retail_steps.rb index 26711bceb2fa..61d7e396715b 100644 --- a/testsuite/features/step_definitions/retail_steps.rb +++ b/testsuite/features/step_definitions/retail_steps.rb @@ -163,7 +163,7 @@ def compute_kiwi_profile_version(host) node.run("echo -e \"#{conf}\" > #{file} && echo -e \"#{conf2}\" > #{file2} && systemctl restart #{service}") end # /etc/netplan/01-netcfg.yaml - nodes = [get_targer('deblike_minion')] + nodes = [get_target('deblike_minion')] source = File.dirname(__FILE__) + '/../upload_files/01-netcfg.yaml' dest = '/etc/netplan/01-netcfg.yaml' nodes.each do |node| From bf54933fe5cae2930791bc8a1c43d84ecc124308 Mon Sep 17 00:00:00 2001 From: maximenoel8 <55169628+maximenoel8@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:12:14 +1200 Subject: [PATCH 057/127] Increase bootstrap script timeout and handle ut-8 format (#7370) --- testsuite/features/step_definitions/file_management_steps.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/features/step_definitions/file_management_steps.rb b/testsuite/features/step_definitions/file_management_steps.rb index 26dbac3217b5..21222808483e 100644 --- a/testsuite/features/step_definitions/file_management_steps.rb +++ b/testsuite/features/step_definitions/file_management_steps.rb @@ -79,9 +79,9 @@ return_code = file_inject(target, source, dest) raise 'File injection failed' unless return_code.zero? system_name = get_system_name(host) - output, = target.run("expect -f /tmp/#{boostrap_script} #{system_name}", verbose: true) + output, = target.run("sed -i '/^set timeout /c\\set timeout #{DEFAULT_TIMEOUT}' /tmp/#{boostrap_script} && expect -f /tmp/#{boostrap_script} #{system_name}", verbose: true) unless output.include? '-bootstrap complete-' - log output + log output.encode('utf-8', invalid: :replace, undef: :replace, replace: '_') raise "Bootstrap didn't finish properly" end end From ca8f0e7ed15b7362af649f00f7d70b906ee83174 Mon Sep 17 00:00:00 2001 From: elariekerboull Date: Wed, 9 Aug 2023 12:28:52 +0200 Subject: [PATCH 058/127] Add missing 'empty' (#7395) --- .../features/secondary/buildhost_docker_build_image.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/features/secondary/buildhost_docker_build_image.feature b/testsuite/features/secondary/buildhost_docker_build_image.feature index 44b2ab81a52d..8456a4215933 100644 --- a/testsuite/features/secondary/buildhost_docker_build_image.feature +++ b/testsuite/features/secondary/buildhost_docker_build_image.feature @@ -96,7 +96,7 @@ Feature: Build container images When I schedule the build of image "suse_simple" with version "Latest_simple" via API calls And I wait at most 600 seconds until image "suse_simple" with version "Latest_simple" is built successfully via API And I wait at most 300 seconds until image "suse_simple" with version "Latest_simple" is inspected successfully via API - Then the list of packages of image "suse_simple" with version "Latest_simple" is not + Then the list of packages of image "suse_simple" with version "Latest_simple" is not empty When I wait until no Salt job is running on "build_host" Scenario: Delete image via API calls From 8d79beba29f655c7806cbc518ade847a8877010f Mon Sep 17 00:00:00 2001 From: Ondrej Holecek Date: Mon, 7 Aug 2023 15:53:37 +0200 Subject: [PATCH 059/127] Check for configured rhn.conf instead of rpm run status Under some circumstances like updating older unconfigured SUMA system, tomcat.xml was not configured properly as source tomcat.xml was not configured. Instead of relying if we are doing rpm update or new install, check status or rhn.conf file. --- ...lk-setup.changes.oholecek.tomcat-install-check | 1 + spacewalk/setup/spacewalk-setup.spec | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 spacewalk/setup/spacewalk-setup.changes.oholecek.tomcat-install-check diff --git a/spacewalk/setup/spacewalk-setup.changes.oholecek.tomcat-install-check b/spacewalk/setup/spacewalk-setup.changes.oholecek.tomcat-install-check new file mode 100644 index 000000000000..808a0993a282 --- /dev/null +++ b/spacewalk/setup/spacewalk-setup.changes.oholecek.tomcat-install-check @@ -0,0 +1 @@ +- Do not rely on rpm runtime status, rather check rhn.conf if is configured (bsc#1210935) diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 17b5bf29ea20..5206fb63bc92 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -191,18 +191,17 @@ install -Dd -m 0755 %{buildroot}%{_prefix}/share/salt-formulas/states install -Dd -m 0755 %{buildroot}%{_prefix}/share/salt-formulas/metadata %post -if [ $1 == 1 -a -e /etc/tomcat/server.xml ]; then -#just during new installation. during upgrade the changes are already applied +if [ -f /etc/rhn/rhn.conf -a $(filesize /etc/rhn/rhn.conf) -gt 1 ]; then + # rhn.conf is configured, this is an upgrade + # during upgrade, setup new connectionTimeout if the user didn't change it. Keeping it until SUMA 4.2 is maintained CURRENT_DATE=$(date +"%%Y-%%m-%%dT%%H:%%M:%%S.%%3N") cp /etc/tomcat/server.xml /etc/tomcat/server.xml.$CURRENT_DATE - xsltproc %{_datadir}/spacewalk/setup/server.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml -fi - -if [ $1 == 2 -a -e /etc/tomcat/server.xml ]; then -#during upgrade, setup new connectionTimeout if the user didn't change it. Keeping it until SUMA 4.2 is maintained + xsltproc %{_datadir}/spacewalk/setup/server_update.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml +else + # rhn.conf does not exists or is empty, this is new installation or update of new installation CURRENT_DATE=$(date +"%%Y-%%m-%%dT%%H:%%M:%%S.%%3N") cp /etc/tomcat/server.xml /etc/tomcat/server.xml.$CURRENT_DATE - xsltproc %{_datadir}/spacewalk/setup/server_update.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml + xsltproc %{_datadir}/spacewalk/setup/server.xml.xsl /etc/tomcat/server.xml.$CURRENT_DATE > /etc/tomcat/server.xml fi if [ -e /etc/zypp/credentials.d/SCCcredentials ]; then From 43dc4ae43467f64cda7a57cc155cc3b5e2679082 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 20 Jun 2023 18:13:24 +0200 Subject: [PATCH 060/127] First implementation forbid clonning channel payg Signed-off-by: Miguel Sama --- .../manager/channel/CloneChannelCommand.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java index 30b5d91ec9b5..883b46c56907 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java @@ -26,7 +26,10 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException; import com.redhat.rhn.manager.errata.ErrataManager; +import java.util.Collection; +import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; /** * CreateChannelCommand - command to clone a channel. @@ -114,6 +117,21 @@ public Channel create() c.setInstallerUpdates(original.isInstallerUpdates()); c.setOriginal(original); + // PAYG Code to avoid cloning channels under forbidden channels + if (c.getParentChannel() != null) { + Optional channelTest = c.getParentChannel().originChain() + .map(n -> n.getAccessibleChildrenFor(user)) + .flatMap(Collection::stream) + .filter(n -> !n.getName().equals(name)) // We filter out the cloned channel from the list + .filter(n -> n.getProductName().getLabel().equals(original.getProductName().getLabel())) + .findFirst(); + + if (!channelTest.isPresent()) { + throw new InvalidParentChannelException(); + } + } + + // need to save before calling stored procs below ChannelFactory.save(c); c = HibernateFactory.reload(c); From b0696f13341c4a2ae0268c27e0c8e7cfbac65427 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 21 Jun 2023 15:53:33 +0200 Subject: [PATCH 061/127] Improved logic for forbidding cloning channels in payg Signed-off-by: Miguel Sama --- .../manager/channel/CloneChannelCommand.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java index 883b46c56907..1106fd104420 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java @@ -15,6 +15,7 @@ package com.redhat.rhn.manager.channel; +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.common.hibernate.HibernateFactory; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelArch; @@ -118,20 +119,21 @@ public Channel create() c.setOriginal(original); // PAYG Code to avoid cloning channels under forbidden channels - if (c.getParentChannel() != null) { - Optional channelTest = c.getParentChannel().originChain() - .map(n -> n.getAccessibleChildrenFor(user)) - .flatMap(Collection::stream) - .filter(n -> !n.getName().equals(name)) // We filter out the cloned channel from the list - .filter(n -> n.getProductName().getLabel().equals(original.getProductName().getLabel())) - .findFirst(); - - if (!channelTest.isPresent()) { - throw new InvalidParentChannelException(); + if (GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance()) { + if (c.getParentChannel() != null) { + Optional channelTest = c.getParentChannel().originChain() + .map(n -> n.getAccessibleChildrenFor(user)) + .flatMap(Collection::stream) + .filter(n -> n.getId() != null) // We filter out the cloned channel from the list + .filter(n -> n.getProductName().getLabel().equals(original.getProductName().getLabel())) + .findFirst(); + + if (!channelTest.isPresent()) { + throw new ForbiddenCloneChannelPAYGException(); + } } } - // need to save before calling stored procs below ChannelFactory.save(c); c = HibernateFactory.reload(c); From 7616c84cacbaf5f090d8917f3e66d19a145e4861 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 21 Jun 2023 15:54:13 +0200 Subject: [PATCH 062/127] Add exception for forbidden clone channels in payg Signed-off-by: Miguel Sama --- .../ForbiddenCloneChannelPAYGException.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java diff --git a/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java b/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java new file mode 100644 index 000000000000..970678087ee4 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java @@ -0,0 +1,16 @@ +package com.redhat.rhn.manager.channel; + +import com.redhat.rhn.FaultException; +import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException; + +/** + * ForbiddenCloneChannelPAYGException + */ +public class ForbiddenCloneChannelPAYGException extends InvalidParentChannelException { + /** + * Constructor + */ + public ForbiddenCloneChannelPAYGException() { + super(); + } +} From 53b387d7fc18968a911d92712b19f716d759afc7 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 21 Jun 2023 15:54:47 +0200 Subject: [PATCH 063/127] Add exception handling for ForbiddenCloneChannelPAYGException Signed-off-by: Miguel Sama --- .../action/channel/manage/EditChannelAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java index 7ead42d10aba..1b40c5c9fe98 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java @@ -41,11 +41,7 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidChannelNameException; import com.redhat.rhn.frontend.xmlrpc.InvalidGPGKeyException; import com.redhat.rhn.frontend.xmlrpc.InvalidGPGUrlException; -import com.redhat.rhn.manager.channel.ChannelManager; -import com.redhat.rhn.manager.channel.CloneChannelCommand; -import com.redhat.rhn.manager.channel.CreateChannelCommand; -import com.redhat.rhn.manager.channel.InvalidGPGFingerprintException; -import com.redhat.rhn.manager.channel.UpdateChannelCommand; +import com.redhat.rhn.manager.channel.*; import com.redhat.rhn.manager.download.DownloadManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; @@ -500,6 +496,10 @@ private Long createChannelHelper(CreateChannelCommand command, DynaActionForm fo catch (IllegalArgumentException iae) { errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(iae.getMessage())); } + catch (ForbiddenCloneChannelPAYGException f) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( + "edit.channel.forbiddenclonechannelpayg")); + } return null; } From 0dbac7d8110443d5b3549ae76210ad2827a43337 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 21 Jun 2023 15:55:13 +0200 Subject: [PATCH 064/127] Add string for `edit.channel.forbiddenclonechannelpayg` Signed-off-by: Miguel Sama --- .../rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 7d3c257f3c4c..6e0f66e8e503 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8261,6 +8261,12 @@ Follow this url to see the full list of inactive systems: /channels/manage/Edit + + Cloning of channels under different product channels on Pay As You Go instances is forbidden + + /channels/manage/Edit + + Channel <strong>'{0}'</strong> has been deleted. From d2b7d02ebc0f09fe130a6cf223609e8bd58d0ad2 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 22 Jun 2023 15:17:07 +0200 Subject: [PATCH 065/127] Add unit tests for cloning channels in PAYG instances Signed-off-by: Miguel Sama --- .../channel/test/CloneChannelCommandTest.java | 83 +++++++++++++++++-- 1 file changed, 78 insertions(+), 5 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index 16f250cb829d..0c35e1ec20aa 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -15,20 +15,24 @@ package com.redhat.rhn.manager.channel.test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.Modules; +import com.redhat.rhn.domain.channel.ProductName; +import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; +import com.redhat.rhn.domain.product.SUSEProductChannel; import com.redhat.rhn.manager.channel.CloneChannelCommand; +import com.redhat.rhn.manager.channel.ForbiddenCloneChannelPAYGException; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; +import com.redhat.rhn.testing.TestUtils; +import com.suse.cloud.CloudPaygManager; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + public class CloneChannelCommandTest extends BaseTestCaseWithUser { /** @@ -111,6 +115,75 @@ public void testStripModularMetadata() throws Exception { assertFalse(c.isModular()); } + @Test + public void testCloneParentChannelPAYG () throws Exception { + GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance + Channel parentChannel = createBaseChannel(); + + CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, parentChannel); + ccc.setUser(user); + Channel clonedParentChannel = ccc.create(); + + // Assert that the channel actually exists + Channel gotChannel = ChannelFactory.lookupByIdAndUser(clonedParentChannel.getId(), user); + assertNotNull(gotChannel); + } + + @Test + public void testCloneChildChannelPAYG () throws Exception { + GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance + + Channel parentChannelWithProductChannels = createBaseChannel(); + Channel parentChannelWithoutProductChannels = createBaseChannel(); + + Channel childrenChannel = ChannelTestUtils.createChildChannel(user, parentChannelWithProductChannels); + childrenChannel.setChecksumType(ChannelFactory.findChecksumTypeByLabel("sha256")); + childrenChannel.setSummary("summary"); + + ProductName pn = ChannelFactoryTest.lookupOrCreateProductName("sap-ha"); + childrenChannel.setProductName(pn); + TestUtils.saveAndFlush(pn); + ChannelFactory.save(childrenChannel); + + + // Test 1 - Check cloning channel under a base channel with the same channel works + CloneChannelCommand ccc1 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); + ccc1.setUser(user); + ccc1.setParentId(parentChannelWithProductChannels.getId()); + Channel clonedChildChannel1 = ccc1.create(); + + // Assert that the channel actually exists + Channel gotChannelTest1 = ChannelFactory.lookupByIdAndUser(clonedChildChannel1.getId(), user); + assertNotNull(gotChannelTest1); + ChannelFactory.remove(gotChannelTest1); + + // Test 2 - Check cloning channel under a base channel without the same channel fails + CloneChannelCommand ccc2 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); + ccc2.setUser(user); + ccc2.setParentId(parentChannelWithoutProductChannels.getId()); + Channel clonedChildChannel2 = null; + + try { + clonedChildChannel2 = ccc2.create(); + } catch (ForbiddenCloneChannelPAYGException f) {} // Catch this specific exception to avoid aborting the test + + // Assert that the channel is null, which means it wasn't created + assertNull(clonedChildChannel2); + + + // Test 3 - Clone a base channel that has children with product channels, and clone under it a channel + // with those product channels (Recursive check). + CloneChannelCommand ccc3 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, parentChannelWithProductChannels); + ccc3.setUser(user); + Channel clonedBaseChannel = ccc3.create(); + + ccc2.setParentId(clonedBaseChannel.getId()); + Channel clonedChildChannel3 = ccc2.create(); + + // Assert that the channel actually exists + Channel gotChannelTest3 = ChannelFactory.lookupByIdAndUser(clonedChildChannel3.getId(), user); + assertNotNull(gotChannelTest3); + } private Channel createBaseChannel() throws Exception { Channel channel = ChannelTestUtils.createBaseChannel(user); From cfd6f66f5c566fcbcde4c89b23bfe00ef7029ec0 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 22 Jun 2023 15:32:24 +0200 Subject: [PATCH 066/127] Add comments to tests Signed-off-by: Miguel Sama --- .../channel/test/CloneChannelCommandTest.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index 0c35e1ec20aa..bfb8dc4aa331 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -115,6 +115,11 @@ public void testStripModularMetadata() throws Exception { assertFalse(c.isModular()); } + /** + * testCloneParentChannelPAYG tests that it's possible to clone all base channels in a SUMA PAYG instace. + * + * @throws Exception if something goes wrong + */ @Test public void testCloneParentChannelPAYG () throws Exception { GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance @@ -129,6 +134,17 @@ public void testCloneParentChannelPAYG () throws Exception { assertNotNull(gotChannel); } + /** + * testCloneChildChannelPAYG test different scenarios when cloning channels under base channels. + * Test 1 - Tests that cloning a channel under the same base channel works. + * Test 2 - Test that cloning a channel under a different base channel that has not the channel product we are + * cloning from, fails. + * Test 3 - Tests some recursiveness. It clones a base channel that has associated some product channel, and then + * under that cloned base channel it clones a child channel with the same product channel as the first one. + * This test should work. + * + * @throws Exception if something goes wrong + */ @Test public void testCloneChildChannelPAYG () throws Exception { GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance @@ -145,8 +161,7 @@ public void testCloneChildChannelPAYG () throws Exception { TestUtils.saveAndFlush(pn); ChannelFactory.save(childrenChannel); - - // Test 1 - Check cloning channel under a base channel with the same channel works + // Test 1 CloneChannelCommand ccc1 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); ccc1.setUser(user); ccc1.setParentId(parentChannelWithProductChannels.getId()); @@ -157,7 +172,7 @@ public void testCloneChildChannelPAYG () throws Exception { assertNotNull(gotChannelTest1); ChannelFactory.remove(gotChannelTest1); - // Test 2 - Check cloning channel under a base channel without the same channel fails + // Test 2 CloneChannelCommand ccc2 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); ccc2.setUser(user); ccc2.setParentId(parentChannelWithoutProductChannels.getId()); @@ -171,8 +186,7 @@ public void testCloneChildChannelPAYG () throws Exception { assertNull(clonedChildChannel2); - // Test 3 - Clone a base channel that has children with product channels, and clone under it a channel - // with those product channels (Recursive check). + // Test 3 CloneChannelCommand ccc3 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, parentChannelWithProductChannels); ccc3.setUser(user); Channel clonedBaseChannel = ccc3.create(); From 4074079327b747df143dd78032203c2e1e49e6f2 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 22 Jun 2023 16:13:15 +0200 Subject: [PATCH 067/127] Fix linting Signed-off-by: Miguel Sama --- .../channel/manage/EditChannelAction.java | 7 +++- .../manager/channel/CloneChannelCommand.java | 2 -- .../ForbiddenCloneChannelPAYGException.java | 15 ++++++++- .../channel/test/CloneChannelCommandTest.java | 33 ++++++++++++------- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java index 1b40c5c9fe98..1221b2332670 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java @@ -41,7 +41,12 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidChannelNameException; import com.redhat.rhn.frontend.xmlrpc.InvalidGPGKeyException; import com.redhat.rhn.frontend.xmlrpc.InvalidGPGUrlException; -import com.redhat.rhn.manager.channel.*; +import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.manager.channel.CloneChannelCommand; +import com.redhat.rhn.manager.channel.CreateChannelCommand; +import com.redhat.rhn.manager.channel.ForbiddenCloneChannelPAYGException; +import com.redhat.rhn.manager.channel.InvalidGPGFingerprintException; +import com.redhat.rhn.manager.channel.UpdateChannelCommand; import com.redhat.rhn.manager.download.DownloadManager; import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.manager.user.UserManager; diff --git a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java index 1106fd104420..75f4f2373140 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java @@ -28,9 +28,7 @@ import com.redhat.rhn.manager.errata.ErrataManager; import java.util.Collection; -import java.util.List; import java.util.Optional; -import java.util.stream.Collectors; /** * CreateChannelCommand - command to clone a channel. diff --git a/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java b/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java index 970678087ee4..586ea1dcfc8a 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java +++ b/java/code/src/com/redhat/rhn/manager/channel/ForbiddenCloneChannelPAYGException.java @@ -1,6 +1,19 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ package com.redhat.rhn.manager.channel; -import com.redhat.rhn.FaultException; import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException; /** diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index bfb8dc4aa331..cb1286083197 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -15,23 +15,25 @@ package com.redhat.rhn.manager.channel.test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.Modules; import com.redhat.rhn.domain.channel.ProductName; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; -import com.redhat.rhn.domain.product.SUSEProductChannel; import com.redhat.rhn.manager.channel.CloneChannelCommand; import com.redhat.rhn.manager.channel.ForbiddenCloneChannelPAYGException; import com.redhat.rhn.testing.BaseTestCaseWithUser; import com.redhat.rhn.testing.ChannelTestUtils; - import com.redhat.rhn.testing.TestUtils; -import com.suse.cloud.CloudPaygManager; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; public class CloneChannelCommandTest extends BaseTestCaseWithUser { @@ -121,11 +123,12 @@ public void testStripModularMetadata() throws Exception { * @throws Exception if something goes wrong */ @Test - public void testCloneParentChannelPAYG () throws Exception { + public void testCloneParentChannelPAYG() throws Exception { GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance Channel parentChannel = createBaseChannel(); - CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, parentChannel); + CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + parentChannel); ccc.setUser(user); Channel clonedParentChannel = ccc.create(); @@ -146,7 +149,7 @@ public void testCloneParentChannelPAYG () throws Exception { * @throws Exception if something goes wrong */ @Test - public void testCloneChildChannelPAYG () throws Exception { + public void testCloneChildChannelPAYG() throws Exception { GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance Channel parentChannelWithProductChannels = createBaseChannel(); @@ -162,7 +165,8 @@ public void testCloneChildChannelPAYG () throws Exception { ChannelFactory.save(childrenChannel); // Test 1 - CloneChannelCommand ccc1 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); + CloneChannelCommand ccc1 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + childrenChannel); ccc1.setUser(user); ccc1.setParentId(parentChannelWithProductChannels.getId()); Channel clonedChildChannel1 = ccc1.create(); @@ -173,21 +177,26 @@ public void testCloneChildChannelPAYG () throws Exception { ChannelFactory.remove(gotChannelTest1); // Test 2 - CloneChannelCommand ccc2 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, childrenChannel); + CloneChannelCommand ccc2 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + childrenChannel); ccc2.setUser(user); ccc2.setParentId(parentChannelWithoutProductChannels.getId()); Channel clonedChildChannel2 = null; try { clonedChildChannel2 = ccc2.create(); - } catch (ForbiddenCloneChannelPAYGException f) {} // Catch this specific exception to avoid aborting the test + } + catch (ForbiddenCloneChannelPAYGException f) { + // Catch this specific exception to avoid aborting the test + } // Assert that the channel is null, which means it wasn't created assertNull(clonedChildChannel2); // Test 3 - CloneChannelCommand ccc3 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, parentChannelWithProductChannels); + CloneChannelCommand ccc3 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + parentChannelWithProductChannels); ccc3.setUser(user); Channel clonedBaseChannel = ccc3.create(); From 4880fcf67466b72f97d64ac00c413dc95bff3e5c Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 22 Jun 2023 17:23:05 +0200 Subject: [PATCH 068/127] Add changelog Signed-off-by: Miguel Sama --- java/spacewalk-java.changes.mikeletux.restrict-cloning | 1 + 1 file changed, 1 insertion(+) create mode 100644 java/spacewalk-java.changes.mikeletux.restrict-cloning diff --git a/java/spacewalk-java.changes.mikeletux.restrict-cloning b/java/spacewalk-java.changes.mikeletux.restrict-cloning new file mode 100644 index 000000000000..0e10d2455724 --- /dev/null +++ b/java/spacewalk-java.changes.mikeletux.restrict-cloning @@ -0,0 +1 @@ +- Restrict cloning channels under different product channels for PAYG From 97689c6d2d044415c04b05cc51109667b1eaae0a Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Fri, 23 Jun 2023 12:33:30 +0200 Subject: [PATCH 069/127] Add constructor for testing and clean the code Signed-off-by: Miguel Sama --- .../manager/channel/CloneChannelCommand.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java index 75f4f2373140..09449ae3adc8 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java +++ b/java/code/src/com/redhat/rhn/manager/channel/CloneChannelCommand.java @@ -27,7 +27,8 @@ import com.redhat.rhn.frontend.xmlrpc.InvalidParentChannelException; import com.redhat.rhn.manager.errata.ErrataManager; -import java.util.Collection; +import com.suse.cloud.CloudPaygManager; + import java.util.Optional; /** @@ -39,6 +40,7 @@ public class CloneChannelCommand extends CreateChannelCommand { private Channel original; private String DEFAULT_PREFIX = "clone-of-"; private boolean stripModularMetadata = false; + private CloudPaygManager cloudPaygManager; /** * Clone Behavior type @@ -67,6 +69,21 @@ public CloneChannelCommand(CloneBehavior cloneBehaviorIn, Channel cloneFrom) { gpgKeyFp = cloneFrom.getGPGKeyFp(); gpgCheck = cloneFrom.isGPGCheck(); archLabel = Optional.ofNullable(cloneFrom.getChannelArch()).map(ChannelArch::getLabel).orElse(""); + cloudPaygManager = GlobalInstanceHolder.PAYG_MANAGER; + } + + /** + * Constructor for testing + * @param cloneBehaviorIn the cloning behavior + * @param cloneFrom channel to clone from + * @param testCloudPaygManager {@link CloudPaygManager} to use + */ + public CloneChannelCommand(CloneBehavior cloneBehaviorIn, Channel cloneFrom, + CloudPaygManager testCloudPaygManager) { + this(cloneBehaviorIn, cloneFrom); + if (testCloudPaygManager != null) { + cloudPaygManager = testCloudPaygManager; + } } /** @@ -117,16 +134,15 @@ public Channel create() c.setOriginal(original); // PAYG Code to avoid cloning channels under forbidden channels - if (GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance()) { + if (cloudPaygManager.isPaygInstance()) { if (c.getParentChannel() != null) { Optional channelTest = c.getParentChannel().originChain() - .map(n -> n.getAccessibleChildrenFor(user)) - .flatMap(Collection::stream) + .flatMap(n -> n.getAccessibleChildrenFor(user).stream()) .filter(n -> n.getId() != null) // We filter out the cloned channel from the list .filter(n -> n.getProductName().getLabel().equals(original.getProductName().getLabel())) .findFirst(); - if (!channelTest.isPresent()) { + if (channelTest.isEmpty()) { throw new ForbiddenCloneChannelPAYGException(); } } From 22779fd54853d2f36f88c817f7e2aeab4d6a4446 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Fri, 23 Jun 2023 12:34:05 +0200 Subject: [PATCH 070/127] Broke down test into several ones Signed-off-by: Miguel Sama --- .../channel/test/CloneChannelCommandTest.java | 138 +++++++++++------- 1 file changed, 82 insertions(+), 56 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index cb1286083197..53eacd275a68 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -19,9 +19,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; import com.redhat.rhn.domain.channel.Modules; @@ -33,6 +33,8 @@ import com.redhat.rhn.testing.ChannelTestUtils; import com.redhat.rhn.testing.TestUtils; +import com.suse.cloud.CloudPaygManager; + import org.junit.jupiter.api.Test; public class CloneChannelCommandTest extends BaseTestCaseWithUser { @@ -118,93 +120,98 @@ public void testStripModularMetadata() throws Exception { } /** - * testCloneParentChannelPAYG tests that it's possible to clone all base channels in a SUMA PAYG instace. + * Tests if it's possible to clone base channels in a SUMA PAYG instace. * * @throws Exception if something goes wrong */ @Test - public void testCloneParentChannelPAYG() throws Exception { - GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance + public void canCloneParentChannelInPAYGInstance() throws Exception { + CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); Channel parentChannel = createBaseChannel(); CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, - parentChannel); + parentChannel, fakeCloudPaygManager); ccc.setUser(user); Channel clonedParentChannel = ccc.create(); - // Assert that the channel actually exists + // Asserts that the channel actually exists after cloning Channel gotChannel = ChannelFactory.lookupByIdAndUser(clonedParentChannel.getId(), user); assertNotNull(gotChannel); } /** - * testCloneChildChannelPAYG test different scenarios when cloning channels under base channels. - * Test 1 - Tests that cloning a channel under the same base channel works. - * Test 2 - Test that cloning a channel under a different base channel that has not the channel product we are - * cloning from, fails. - * Test 3 - Tests some recursiveness. It clones a base channel that has associated some product channel, and then - * under that cloned base channel it clones a child channel with the same product channel as the first one. - * This test should work. + * Tests that cloning a channel under the same base channel works in a SUMA PAYG instace. * - * @throws Exception if something goes wrong + * @throws Exception */ @Test - public void testCloneChildChannelPAYG() throws Exception { - GlobalInstanceHolder.PAYG_MANAGER.setPaygInstance(true); // Mock we are in a PAYG SUMA instance + public void canCloneChildChannelUnderSameParentChannel() throws Exception { + CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); Channel parentChannelWithProductChannels = createBaseChannel(); - Channel parentChannelWithoutProductChannels = createBaseChannel(); - - Channel childrenChannel = ChannelTestUtils.createChildChannel(user, parentChannelWithProductChannels); - childrenChannel.setChecksumType(ChannelFactory.findChecksumTypeByLabel("sha256")); - childrenChannel.setSummary("summary"); - - ProductName pn = ChannelFactoryTest.lookupOrCreateProductName("sap-ha"); - childrenChannel.setProductName(pn); - TestUtils.saveAndFlush(pn); - ChannelFactory.save(childrenChannel); + Channel childrenChannel = createChildrenWIthProductChannel(parentChannelWithProductChannels); - // Test 1 - CloneChannelCommand ccc1 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, - childrenChannel); - ccc1.setUser(user); - ccc1.setParentId(parentChannelWithProductChannels.getId()); - Channel clonedChildChannel1 = ccc1.create(); + CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + childrenChannel, fakeCloudPaygManager); + ccc.setUser(user); + ccc.setParentId(parentChannelWithProductChannels.getId()); + Channel clonedChildChannel1 = ccc.create(); - // Assert that the channel actually exists + // Asserts that the channel actually exists after cloning Channel gotChannelTest1 = ChannelFactory.lookupByIdAndUser(clonedChildChannel1.getId(), user); assertNotNull(gotChannelTest1); - ChannelFactory.remove(gotChannelTest1); + } - // Test 2 - CloneChannelCommand ccc2 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, - childrenChannel); - ccc2.setUser(user); - ccc2.setParentId(parentChannelWithoutProductChannels.getId()); - Channel clonedChildChannel2 = null; + @Test + /** + * Tests that cloning a channel under a different base channel that has not the channel product we are + * cloning from fails in a SUMA PAYG instace. + * + * @throws Exception + */ + public void canCloneChildChannelUnderDifferentParentChannelWithoutProductChannel() throws Exception { + CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); - try { - clonedChildChannel2 = ccc2.create(); - } - catch (ForbiddenCloneChannelPAYGException f) { - // Catch this specific exception to avoid aborting the test - } + Channel parentChannelWithProductChannels = createBaseChannel(); + Channel parentChannelWithoutProductChannels = createBaseChannel(); + Channel childrenChannel = createChildrenWIthProductChannel(parentChannelWithProductChannels); - // Assert that the channel is null, which means it wasn't created - assertNull(clonedChildChannel2); + CloneChannelCommand ccc = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + childrenChannel, fakeCloudPaygManager); + ccc.setUser(user); + ccc.setParentId(parentChannelWithoutProductChannels.getId()); + + // Assert that cloning operation throws ForbiddenCloneChannelPAYGException exception + assertThrows(ForbiddenCloneChannelPAYGException.class, () -> ccc.create()); + } + + /** + * Tests some recursiveness. It clones a base channel that has associated some product channel, and then + * under that cloned base channel it clones a child channel with the same product channel as the first one. + * This test is for SUMA PAYG instaces. + * + * @throws Exception + */ + @Test + public void canClonedBasedChannelGetChildChannelWithProductChannel() throws Exception { + CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); + Channel parentChannelWithProductChannels = createBaseChannel(); + Channel childrenChannel = createChildrenWIthProductChannel(parentChannelWithProductChannels); - // Test 3 - CloneChannelCommand ccc3 = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, - parentChannelWithProductChannels); - ccc3.setUser(user); - Channel clonedBaseChannel = ccc3.create(); + CloneChannelCommand cccBase = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + parentChannelWithProductChannels, fakeCloudPaygManager); + cccBase.setUser(user); + Channel clonedBaseChannel = cccBase.create(); - ccc2.setParentId(clonedBaseChannel.getId()); - Channel clonedChildChannel3 = ccc2.create(); + CloneChannelCommand cccChildren = new CloneChannelCommand(CloneChannelCommand.CloneBehavior.ORIGINAL_STATE, + childrenChannel, fakeCloudPaygManager); + cccChildren.setUser(user); + cccChildren.setParentId(clonedBaseChannel.getId()); + Channel clonedChildChannel = cccChildren.create(); // Assert that the channel actually exists - Channel gotChannelTest3 = ChannelFactory.lookupByIdAndUser(clonedChildChannel3.getId(), user); + Channel gotChannelTest3 = ChannelFactory.lookupByIdAndUser(clonedChildChannel.getId(), user); assertNotNull(gotChannelTest3); } @@ -214,4 +221,23 @@ private Channel createBaseChannel() throws Exception { channel.setSummary("summary"); return channel; } + + private CloudPaygManager getFakeCloudPaygManager() { + CloudPaygManager cloudPaygManager = new CloudPaygManager(); + cloudPaygManager.setPaygInstance(true); + return cloudPaygManager; + } + + private Channel createChildrenWIthProductChannel(Channel parentChannel) throws Exception { + Channel childrenChannel = ChannelTestUtils.createChildChannel(user, parentChannel); + childrenChannel.setChecksumType(ChannelFactory.findChecksumTypeByLabel("sha256")); + childrenChannel.setSummary("summary"); + + ProductName pn = ChannelFactoryTest.lookupOrCreateProductName("sap-ha"); + childrenChannel.setProductName(pn); + TestUtils.saveAndFlush(pn); + ChannelFactory.save(childrenChannel); + + return childrenChannel; + } } From 6f19f50b9993eb88c2866c862ccad277482e756c Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 26 Jun 2023 10:52:36 +0200 Subject: [PATCH 071/127] Ammend test name Signed-off-by: Miguel Sama --- .../rhn/manager/channel/test/CloneChannelCommandTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index 53eacd275a68..712b7c7eeea5 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -169,7 +169,7 @@ public void canCloneChildChannelUnderSameParentChannel() throws Exception { * * @throws Exception */ - public void canCloneChildChannelUnderDifferentParentChannelWithoutProductChannel() throws Exception { + public void cannotCloneChildChannelUnderDifferentParentChannelWithoutProductChannel() throws Exception { CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); Channel parentChannelWithProductChannels = createBaseChannel(); From f3391cef2d6f7f50035701c81e0b4c348f63071a Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 26 Jun 2023 12:17:34 +0200 Subject: [PATCH 072/127] Amend issue with Test tag Signed-off-by: Miguel Sama --- .../rhn/manager/channel/test/CloneChannelCommandTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java index 712b7c7eeea5..4a1672c2b906 100644 --- a/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java +++ b/java/code/src/com/redhat/rhn/manager/channel/test/CloneChannelCommandTest.java @@ -162,13 +162,14 @@ public void canCloneChildChannelUnderSameParentChannel() throws Exception { assertNotNull(gotChannelTest1); } - @Test + /** * Tests that cloning a channel under a different base channel that has not the channel product we are * cloning from fails in a SUMA PAYG instace. * * @throws Exception */ + @Test public void cannotCloneChildChannelUnderDifferentParentChannelWithoutProductChannel() throws Exception { CloudPaygManager fakeCloudPaygManager = getFakeCloudPaygManager(); From a19455bbc60d8af5b3423484239e8c856a499dd1 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Fri, 23 Jun 2023 10:31:10 +0200 Subject: [PATCH 073/127] Added rule to include only client with SUSE Manager tools --- .../rhn/domain/channel/ChannelFamily.java | 14 ++ .../dimensions/DimensionsConfiguration.java | 4 +- .../rules/SUSEManagerToolsRule.java | 76 ++++++++ .../rules/test/SUSEManagerToolsRuleTest.java | 183 ++++++++++++++++++ ...-java.changes.mackdk.count-suma-tools-only | 1 + 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/SUSEManagerToolsRule.java create mode 100644 java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/test/SUSEManagerToolsRuleTest.java create mode 100644 java/spacewalk-java.changes.mackdk.count-suma-tools-only diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java index 308713b6454f..2595bc564cb5 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java +++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamily.java @@ -40,6 +40,20 @@ public class ChannelFamily extends BaseDomainHelper { private PublicChannelFamily publicChannelFamily; + /** + * Default constructor. + */ + public ChannelFamily() { + } + + /** + * Constructor that create the family with the specified label. Meant for unit testing only. + * @param labelIn the label + */ + public ChannelFamily(String labelIn) { + this.label = labelIn; + } + /** * @return Returns the channels. */ diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/DimensionsConfiguration.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/DimensionsConfiguration.java index 2adcf6b43ec8..9d190347b8a4 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/DimensionsConfiguration.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/DimensionsConfiguration.java @@ -19,6 +19,7 @@ import com.redhat.rhn.taskomatic.task.payg.dimensions.rules.BaseProductRule; import com.redhat.rhn.taskomatic.task.payg.dimensions.rules.EntitlementRule; import com.redhat.rhn.taskomatic.task.payg.dimensions.rules.RequirementType; +import com.redhat.rhn.taskomatic.task.payg.dimensions.rules.SUSEManagerToolsRule; import com.suse.cloud.domain.BillingDimension; @@ -43,7 +44,8 @@ public class DimensionsConfiguration { BillingDimension.MANAGED_SYSTEMS, List.of( new EntitlementRule(RuleType.INCLUDE, RequirementType.ANY, Set.of(EntitlementManager.SALT, EntitlementManager.MANAGEMENT)), - new BaseProductRule(RuleType.EXCLUDE, Set.of("sles_sap"), true) + new BaseProductRule(RuleType.EXCLUDE, Set.of("sles_sap"), true), + new SUSEManagerToolsRule() ), BillingDimension.MONITORING, List.of( diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/SUSEManagerToolsRule.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/SUSEManagerToolsRule.java new file mode 100644 index 000000000000..bd8b59c4db1b --- /dev/null +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/SUSEManagerToolsRule.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.taskomatic.task.payg.dimensions.rules; + +import com.redhat.rhn.domain.channel.ChannelFamilyFactory; +import com.redhat.rhn.domain.product.SUSEProductSet; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.taskomatic.task.payg.dimensions.DimensionRule; +import com.redhat.rhn.taskomatic.task.payg.dimensions.RuleType; + +import java.util.Objects; +import java.util.stream.Stream; + +/** + * A rule to filter server that use the SUSE Manager tools + */ +public class SUSEManagerToolsRule implements DimensionRule { + + public static final String VERSION_12_REGEX = "12(\\.[1-9]*)?"; + public static final String SLE_PRODUCT_FAMILY = "sle"; + + @Override + public boolean test(Server server) { + // If the SUSE Manager tools are part of the base we count it + if (areToolsPartOfBaseProduct(server)) { + return true; + } + + // Match the Manager Tools family among the products or the subscribed channels + return Stream.concat( + // Extract the families the installed products + server.getInstalledProducts().stream().map(prd -> prd.getSUSEProduct().getChannelFamily()), + // Extract the families from the subscribed channels + server.getChannels().stream().flatMap(ch -> ch.getChannelFamilies().stream()) + ) + .filter(Objects::nonNull) + .anyMatch(family -> ChannelFamilyFactory.TOOLS_CHANNEL_FAMILY_LABEL.equals(family.getLabel())); + } + + @Override + public RuleType getRuleType() { + return RuleType.INCLUDE; + } + + /** + * Returns true if this server has a base product that includes already SUSE Manager tools. This is a special + * case for all SLE 12 products. + * @param server the server to check + * @return true if the SUSE Manager tools are included in the base product, false otherwise. + */ + private static boolean areToolsPartOfBaseProduct(Server server) { + return server.getInstalledProductSet() + .map(SUSEProductSet::getBaseProduct) + .filter(product -> product.getName().startsWith(SLE_PRODUCT_FAMILY) && + product.getVersion().matches(VERSION_12_REGEX)) + .isPresent(); + } + + @Override + public String toString() { + return String.format("SUSEManagerToolsRule: %s if server has the SUSE Manager Tools", getRuleType()); + } +} diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/test/SUSEManagerToolsRuleTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/test/SUSEManagerToolsRuleTest.java new file mode 100644 index 000000000000..f9fe0471465e --- /dev/null +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/dimensions/rules/test/SUSEManagerToolsRuleTest.java @@ -0,0 +1,183 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.taskomatic.task.payg.dimensions.rules.test; + +import static org.jmock.AbstractExpectations.returnValue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.redhat.rhn.domain.channel.Channel; +import com.redhat.rhn.domain.channel.ChannelFamily; +import com.redhat.rhn.domain.product.SUSEProduct; +import com.redhat.rhn.domain.product.SUSEProductSet; +import com.redhat.rhn.domain.server.InstalledProduct; +import com.redhat.rhn.domain.server.Server; +import com.redhat.rhn.taskomatic.task.payg.dimensions.DimensionRule; +import com.redhat.rhn.taskomatic.task.payg.dimensions.rules.SUSEManagerToolsRule; +import com.redhat.rhn.testing.RhnJmockBaseTestCase; + +import org.apache.commons.lang3.RandomStringUtils; +import org.jmock.imposters.ByteBuddyClassImposteriser; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.Optional; +import java.util.Set; + +public class SUSEManagerToolsRuleTest extends RhnJmockBaseTestCase { + + @BeforeEach + public void setup() { + setImposteriser(ByteBuddyClassImposteriser.INSTANCE); + } + + @Test + public void canIncludeWhenProductHasToolsExtensionOrChannelIsSubscribed() { + Set productSetWithSUMATools = Set.of( + mockProduct("sles", "15", true, "7261"), + mockProduct("sle-module-basesystem", "15.4", false, "MODULE"), + mockProduct("sle-module-server-applications", "15.4", false, "MODULE"), + mockProduct("sle-manager-tools", "15.4", false, "SLE-M-T") + ); + + Set channelSetWithSUMATools = Set.of( + mockChannel("sle-product-sles15-sp4-pool-x86_64", "7261"), + mockChannel("sle-product-sles15-sp4-updates-x86_64", "7261"), + mockChannel("sle-module-basesystem15-sp4-pool-x86_64", "MODULE"), + mockChannel("sle-module-basesystem15-sp4-updates-x86_64", "MODULE"), + mockChannel("sle-module-server-applications15-sp4-pool-x86_64", "MODULE"), + mockChannel("sle-module-server-applications15-sp4-updates-x86_64", "MODULE"), + mockChannel("sle-manager-tools15-pool-x86_64-sp4", "SLE-M-T"), + mockChannel("sle-manager-tools15-updates-x86_64-sp4", "SLE-M-T") + ); + + Server serverBoth = mockServer(productSetWithSUMATools, channelSetWithSUMATools); + Server serverOnlyProduct = mockServer(productSetWithSUMATools, Collections.emptySet()); + Server serverOnlyChannel = mockServer(Collections.emptySet(), channelSetWithSUMATools); + + DimensionRule managerToolsRule = new SUSEManagerToolsRule(); + + assertTrue(managerToolsRule.includes(serverBoth)); + assertFalse(managerToolsRule.excludes(serverBoth)); + + assertTrue(managerToolsRule.includes(serverOnlyProduct)); + assertFalse(managerToolsRule.excludes(serverOnlyProduct)); + + assertTrue(managerToolsRule.includes(serverOnlyChannel)); + assertFalse(managerToolsRule.excludes(serverOnlyChannel)); + } + + @Test + public void canExcludeWhenNoToolsArePresent() { + Set channelSetWithoutSUMATools = Set.of( + mockChannel("custom-channel-x86_64", null), + mockChannel("custom-channel-updates-x86_64", null) + ); + + Server server = mockServer(Collections.emptySet(), channelSetWithoutSUMATools); + + DimensionRule managerToolsRule = new SUSEManagerToolsRule(); + + assertTrue(managerToolsRule.excludes(server)); + assertFalse(managerToolsRule.includes(server)); + } + + @Test + public void canIncludeSLES12Server() { + Set sle12ProductSet = Set.of( + mockProduct("sles", "12.3", true, "7261") + ); + + Set sles12ChannelSet = Set.of( + mockChannel("sles12-sp3-pool-x86_64", "7261"), + mockChannel("sles12-sp3-updates-x86_64", "7261"), + mockChannel("sle-manager-tools12-pool-x86_64-sp3", "7261"), + mockChannel("sle-manager-tools12-updates-x86_64-sp3", "7261") + ); + + Server server = mockServer(sle12ProductSet, sles12ChannelSet); + + DimensionRule managerToolsRule = new SUSEManagerToolsRule(); + + assertTrue(managerToolsRule.includes(server)); + assertFalse(managerToolsRule.excludes(server)); + } + + private Channel mockChannel(String channelLabel, String channelFamily) { + Channel channel = mock(Channel.class, channelLabel); + + checking(expectations -> { + expectations.allowing(channel).getLabel(); + expectations.will(returnValue(channelLabel)); + + expectations.allowing(channel).getChannelFamilies(); + expectations.will(returnValue( + channelFamily != null ? Set.of(new ChannelFamily(channelFamily)) : Collections.emptySet() + )); + }); + + return channel; + } + + private Server mockServer(Set installedProductsSet, Set channelsSet) { + Server server = mock(Server.class, RandomStringUtils.randomNumeric(10)); + + checking(expectations -> { + expectations.allowing(server).getInstalledProducts(); + expectations.will(returnValue(installedProductsSet)); + + expectations.allowing(server).getInstalledProductSet(); + expectations.will(returnValue(Optional.of(new SUSEProductSet(installedProductsSet)))); + + expectations.allowing(server).getChannels(); + expectations.will(returnValue(channelsSet)); + }); + + return server; + } + + private InstalledProduct mockProduct(String productName, String version, boolean isBase, String channelFamily) { + InstalledProduct installedProduct = mock(InstalledProduct.class, "installed_" + productName); + SUSEProduct suseProduct = mock(SUSEProduct.class, productName); + + checking(expectations -> { + expectations.allowing(suseProduct).isBase(); + expectations.will(returnValue(isBase)); + + expectations.allowing(suseProduct).getName(); + expectations.will(returnValue(productName)); + + expectations.allowing(suseProduct).getVersion(); + expectations.will(returnValue(version)); + + expectations.allowing(suseProduct).getFriendlyName(); + expectations.will(returnValue("Mock for " + productName + " " + version)); + + expectations.allowing(suseProduct).getChannelFamily(); + expectations.will(returnValue(new ChannelFamily(channelFamily))); + + expectations.allowing(installedProduct).isBaseproduct(); + expectations.will(returnValue(isBase)); + + expectations.allowing(installedProduct).getSUSEProduct(); + expectations.will(returnValue(suseProduct)); + }); + + return installedProduct; + } + +} diff --git a/java/spacewalk-java.changes.mackdk.count-suma-tools-only b/java/spacewalk-java.changes.mackdk.count-suma-tools-only new file mode 100644 index 000000000000..4d1fd9e6fa81 --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.count-suma-tools-only @@ -0,0 +1 @@ +- Added rule to count only servers with SUSE Manager Tools as managed clients From b446eb02b423b7a42a4c3641172504fd9a51ffbb Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 28 Jun 2023 16:28:41 +0200 Subject: [PATCH 074/127] Updated and improved unit test for the computation --- .../test/ChannelFamilyFactoryTest.java | 9 +- .../channel/test/ChannelFamilyTest.java | 7 +- .../product/test/SUSEProductTestUtils.java | 79 +++++++-- .../com/redhat/rhn/domain/server/Server.java | 13 ++ .../server/test/MinionServerFactoryTest.java | 3 +- .../domain/server/test/ServerFactoryTest.java | 3 +- .../test/PaygComputeDimensionsTaskTest.java | 153 ++++++++++++++---- 7 files changed, 211 insertions(+), 56 deletions(-) diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java index 1bbccccaf22b..d632cee7d340 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyFactoryTest.java @@ -118,8 +118,7 @@ public static ChannelFamily createTestChannelFamily(User user, boolean nullOrg) return createTestChannelFamily(user, nullOrg, "ChannelFamily"); } - public static ChannelFamily createTestChannelFamily(User user, boolean nullOrg, - String prefix) { + public static ChannelFamily createTestChannelFamily(User user, boolean nullOrg, String prefix) { String label = prefix + "Label" + TestUtils.randomString(); String name = prefix + "Name" + TestUtils.randomString(); @@ -129,7 +128,7 @@ public static ChannelFamily createTestChannelFamily(User user, boolean nullOrg, cfam.setName(name); ChannelFamilyFactory.save(cfam); - cfam = (ChannelFamily) TestUtils.reload(cfam); + cfam = TestUtils.reload(cfam); if (nullOrg) { PublicChannelFamily pcf = new PublicChannelFamily(); @@ -146,7 +145,7 @@ public static ChannelFamily createTestChannelFamily(User user, boolean nullOrg, cfam.addPrivateChannelFamily(pcf); } - cfam = (ChannelFamily) TestUtils.reload(cfam); - return cfam; + + return TestUtils.reload(cfam); } } diff --git a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyTest.java b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyTest.java index de13dd175e25..55aeb10b8435 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyTest.java +++ b/java/code/src/com/redhat/rhn/domain/channel/test/ChannelFamilyTest.java @@ -63,14 +63,11 @@ public void testChannelFamily() throws Exception { * @param user the user * @param label the label * @return the channel family - * @throws Exception the exception if anything goes wrong */ - public static ChannelFamily ensureChannelFamilyExists(User user, String label) - throws Exception { + public static ChannelFamily ensureChannelFamilyExists(User user, String label) { ChannelFamily cf = ChannelFamilyFactory.lookupByLabel(label, null); if (cf == null) { - cf = ChannelFamilyFactoryTest.createTestChannelFamily(user, true, - TestUtils.randomString()); + cf = ChannelFamilyFactoryTest.createTestChannelFamily(user, true, TestUtils.randomString()); cf.setName(label); cf.setLabel(label); ChannelFamilyFactory.save(cf); diff --git a/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java b/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java index 91ac31396d7f..285a457e15d2 100644 --- a/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java +++ b/java/code/src/com/redhat/rhn/domain/product/test/SUSEProductTestUtils.java @@ -23,6 +23,7 @@ import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.channel.test.ChannelFactoryTest; import com.redhat.rhn.domain.channel.test.ChannelFamilyFactoryTest; +import com.redhat.rhn.domain.channel.test.ChannelFamilyTest; import com.redhat.rhn.domain.common.ManagerInfoFactory; import com.redhat.rhn.domain.credentials.Credentials; import com.redhat.rhn.domain.credentials.CredentialsFactory; @@ -54,6 +55,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; +import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.Session; @@ -61,6 +63,7 @@ import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Random; @@ -72,6 +75,7 @@ */ public class SUSEProductTestUtils extends HibernateFactory { + private static final Random RANDOM = new Random(); private static Logger log = LogManager.getLogger(SUSEProductTestUtils.class); /** @@ -88,13 +92,14 @@ private SUSEProductTestUtils() { public static SUSEProduct createTestSUSEProduct(ChannelFamily family) throws Exception { return createTestSUSEProduct(family, TestUtils.randomString().toLowerCase()); } - /** - * Create a SUSE product (which is different from a {@link com.redhat.rhn.domain.channel.ChannelProduct}). - * @param family the channel family - * @param name the product name - * @return the newly created SUSE product - * @throws Exception if anything goes wrong - */ + + /** + * Create a SUSE product (which is different from a {@link com.redhat.rhn.domain.channel.ChannelProduct}). + * @param family the channel family + * @param name the product name + * @return the newly created SUSE product + * @throws Exception if anything goes wrong + */ public static SUSEProduct createTestSUSEProduct(ChannelFamily family, String name) throws Exception { SUSEProduct product = new SUSEProduct(); product.setName(name); @@ -102,7 +107,7 @@ public static SUSEProduct createTestSUSEProduct(ChannelFamily family, String nam product.setFriendlyName("SUSE Test product " + name); product.setArch(PackageFactory.lookupPackageArchByLabel("x86_64")); product.setRelease("test"); - product.setProductId(new Random().nextInt(999999)); + product.setProductId(RANDOM.nextInt(999999)); product.setBase(true); product.setReleaseStage(ReleaseStage.released); product.setChannelFamily(family); @@ -112,6 +117,35 @@ public static SUSEProduct createTestSUSEProduct(ChannelFamily family, String nam return product; } + /** + * Create a SUSEProduct for test with the given pieces of information. + * @param user the user + * @param name the name of the product + * @param version the version + * @param arch the architecture + * @param family the channel family + * @param isBase true if it is a base product + * @return the created SUSEProduct + */ + public static SUSEProduct createTestSUSEProduct(User user, String name, String version, String arch, String family, + boolean isBase) { + SUSEProduct product = new SUSEProduct(); + + product.setName(name); + product.setVersion(version); + product.setFriendlyName("SUSE Test product " + name); + product.setArch(PackageFactory.lookupPackageArchByLabel(arch)); + product.setRelease("test"); + product.setProductId(RANDOM.nextInt(999999)); + product.setBase(isBase); + product.setReleaseStage(ReleaseStage.released); + product.setChannelFamily(ChannelFamilyTest.ensureChannelFamilyExists(user, family)); + + product = TestUtils.saveAndReload(product); + + return product; + } + /** * Create SUSEProductSCCRepository for the product * @param baseProduct Base product @@ -228,6 +262,33 @@ public static void installSUSEProductOnServer(SUSEProduct product, Server server HibernateFactory.getSession().flush(); } + /** + * Install the specified products on the server + * @param server the server + * @param products the collection of products to install + */ + public static void installSUSEProductsOnServer(Server server, Collection products) { + if (CollectionUtils.isEmpty(products)) { + return; + } + + products.stream() + .map(product -> { + InstalledProduct prd = new InstalledProduct(); + + prd.setName(product.getName()); + prd.setVersion(product.getVersion()); + prd.setRelease(product.getRelease()); + prd.setArch(product.getArch()); + prd.setBaseproduct(product.isBase()); + + return prd; + }) + .forEach(server::addInstalledProduct); + + HibernateFactory.getSession().flush(); + } + /** * Create two standard SUSE Vendor products. * @@ -626,7 +687,7 @@ public static void clearAllProducts() { */ public static SCCRepository createSCCRepository() { SCCRepository bRepo = new SCCRepository(); - bRepo.setSccId(new Random().nextLong()); + bRepo.setSccId(RANDOM.nextLong()); bRepo.setAutorefresh(true); bRepo.setDescription(TestUtils.randomString()); bRepo.setDistroTarget("sle-15-x86_64"); diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java index 915226c97825..ea6caedecef1 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Server.java +++ b/java/code/src/com/redhat/rhn/domain/server/Server.java @@ -2007,6 +2007,19 @@ public Set getInstalledProducts() { return installedProducts; } + /** + * Add an InstalledProduct to this server + * + * @param product the product + */ + public void addInstalledProduct(InstalledProduct product) { + if (this.installedProducts == null) { + this.installedProducts = new HashSet<>(); + } + + this.installedProducts.add(product); + } + /** * Return the installed products or null in case of no products found. * @return installed products diff --git a/java/code/src/com/redhat/rhn/domain/server/test/MinionServerFactoryTest.java b/java/code/src/com/redhat/rhn/domain/server/test/MinionServerFactoryTest.java index be6ed439b602..241fa6c7478a 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/MinionServerFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/MinionServerFactoryTest.java @@ -136,9 +136,8 @@ public void testListMinionsByActions() throws Exception { * * @param owner the user owning the server * @return the MinionServer object - * @throws Exception in case of an error */ - public static MinionServer createTestMinionServer(User owner) throws Exception { + public static MinionServer createTestMinionServer(User owner) { return (MinionServer) ServerFactoryTest.createTestServer(owner, true, ServerConstants.getServerGroupTypeSaltEntitled(), ServerFactoryTest.TYPE_SERVER_MINION); diff --git a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java index d0c3f2146ab8..e096a397d12c 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryTest.java @@ -608,8 +608,7 @@ public static Server createTestServer(User owner, boolean ensureOwnerAccess, } - public static Server createTestServer(User owner, boolean ensureOwnerAccess, - ServerGroupType type, int stype) { + public static Server createTestServer(User owner, boolean ensureOwnerAccess, ServerGroupType type, int stype) { return createTestServer(owner, ensureOwnerAccess, type, stype, new Date()); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygComputeDimensionsTaskTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygComputeDimensionsTaskTest.java index 8cb1cdc8734d..e23dfac97e4f 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygComputeDimensionsTaskTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygComputeDimensionsTaskTest.java @@ -15,43 +15,53 @@ package com.redhat.rhn.taskomatic.task.payg.test; +import static com.redhat.rhn.domain.product.test.SUSEProductTestUtils.createTestSUSEProduct; +import static com.redhat.rhn.domain.product.test.SUSEProductTestUtils.installSUSEProductsOnServer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; -import com.redhat.rhn.domain.channel.ChannelFamily; -import com.redhat.rhn.domain.product.SUSEProduct; -import com.redhat.rhn.domain.product.test.SUSEProductTestUtils; import com.redhat.rhn.domain.server.Server; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.test.MinionServerFactoryTest; import com.redhat.rhn.domain.server.test.ServerFactoryTest; +import com.redhat.rhn.manager.entitlement.EntitlementManager; +import com.redhat.rhn.manager.formula.FormulaMonitoringManager; +import com.redhat.rhn.manager.system.ServerGroupManager; +import com.redhat.rhn.manager.system.entitling.SystemEntitlementManager; +import com.redhat.rhn.manager.system.entitling.SystemEntitler; +import com.redhat.rhn.manager.system.entitling.SystemUnentitler; import com.redhat.rhn.taskomatic.task.payg.PaygComputeDimensionsTask; import com.redhat.rhn.taskomatic.task.payg.dimensions.DimensionsConfiguration; -import com.redhat.rhn.testing.ErrataTestUtils; import com.redhat.rhn.testing.JMockBaseTestCaseWithUser; -import com.redhat.rhn.testing.ServerTestUtils; import com.suse.cloud.CloudPaygManager; import com.suse.cloud.domain.BillingDimension; import com.suse.cloud.domain.PaygDimensionComputation; import com.suse.cloud.domain.PaygDimensionFactory; -import com.suse.cloud.domain.PaygDimensionResult; +import com.suse.manager.virtualization.VirtManagerSalt; +import com.suse.manager.webui.services.iface.MonitoringManager; +import com.suse.manager.webui.services.iface.SaltApi; +import com.suse.manager.webui.services.iface.VirtManager; +import com.suse.manager.webui.services.test.TestSaltApi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.quartz.JobExecutionContext; import java.util.Date; -import java.util.Optional; +import java.util.Set; public class PaygComputeDimensionsTaskTest extends JMockBaseTestCaseWithUser { - private JobExecutionContext contextMock; + private static final String ARCH_X86_64 = "x86_64"; + private static final String ARCH_IBM_Z = "s390x"; + private JobExecutionContext contextMock; private PaygDimensionFactory factory; - private CloudPaygManager cloudManager; + private SystemEntitlementManager systemEntitlementManager; @BeforeEach public void before() { @@ -65,42 +75,119 @@ public boolean isPaygInstance() { }; factory = new PaygDimensionFactory(); + SaltApi saltApi = new TestSaltApi(); + + ServerGroupManager serverGroupManager = new ServerGroupManager(saltApi); + VirtManager virtManager = new VirtManagerSalt(saltApi); + MonitoringManager monitoringManager = new FormulaMonitoringManager(saltApi); + + systemEntitlementManager = new SystemEntitlementManager( + new SystemUnentitler(virtManager, monitoringManager, serverGroupManager), + new SystemEntitler(saltApi, virtManager, monitoringManager, serverGroupManager) + ); } @Test public void canComputeDimensions() throws Exception { - // Creating the servers - Server server1 = MinionServerFactoryTest.createTestMinionServer(user); - server1.setPayg(true); - ServerFactory.save(server1); + assertTrue(ServerFactory.listAllServerIds().isEmpty(), "Unable to execute test: " + + "there are entries the rhnserver table not cleaned up by previous unit tests."); - Server server2 = MinionServerFactoryTest.createTestMinionServer(user); + // Creating the servers // MANAGED_SYSTEMS MONITORING + createPaygSLESSapServer(); // + createSLES12Server(); // X + createOpenSUSEServer(); // X X + createSUSEManagerProxy(); // + createTraditionalClient(); // X - ServerTestUtils.createTestSystem(user); - ServerFactoryTest.createUnentitledTestServer(user, true, ServerFactoryTest.TYPE_SERVER_PROXY, new Date()); - - ChannelFamily channelFamily = ErrataTestUtils.createTestChannelFamily(); - SUSEProduct testProduct1 = SUSEProductTestUtils.createTestSUSEProduct(channelFamily, "sles_sap"); - SUSEProduct testProduct2 = SUSEProductTestUtils.createTestSUSEProduct(channelFamily); - - SUSEProductTestUtils.installSUSEProductOnServer(testProduct1, server1); - SUSEProductTestUtils.installSUSEProductOnServer(testProduct2, server2); + assertEquals(ServerFactory.listAllServerIds().size(), 5, "The expected servers were not created"); var task = new PaygComputeDimensionsTask(DimensionsConfiguration.DEFAULT_CONFIGURATION, factory, cloudManager); task.execute(contextMock); - PaygDimensionComputation result = factory.getLatestSuccessfulComputation(); - assertNotNull(result); - assertTrue(result.isSuccess()); - assertEquals(2, result.getDimensionResults().size()); + PaygDimensionComputation computationResult = factory.getLatestSuccessfulComputation(); + + assertNotNull(computationResult, "No successful computation found"); + assertTrue(computationResult.isSuccess(), "Computation was not successful"); + assertEquals(2, computationResult.getDimensionResults().size(), "Wrong number of result returned"); + + // Check the result for the MANAGED_SYSTEMS dimension + computationResult.getResultForDimension(BillingDimension.MANAGED_SYSTEMS) + .ifPresentOrElse( + result -> assertEquals(3L, result.getCount(), "Wrong count for dimension MANAGED_SYSTEMS"), + () -> fail("No result for dimension MANAGED_SYSTEMS") + ); + + // Check the result for the MONITORING dimension + computationResult.getResultForDimension(BillingDimension.MONITORING) + .ifPresentOrElse( + result -> assertEquals(1L, result.getCount(), "Wrong count for dimension MONITORING"), + () -> fail("No result for dimension MONITORING") + ); + } + + private void createPaygSLESSapServer() { + Server server = MinionServerFactoryTest.createTestMinionServer(user); + server.setServerArch(ServerFactory.lookupServerArchByName(ARCH_X86_64)); + server.setPayg(true); + ServerFactory.save(server); + + installSUSEProductsOnServer(server, Set.of( + createTestSUSEProduct(user, "sles_sap", "15.4", ARCH_X86_64, "AiO", true), + createTestSUSEProduct(user, "sle-module-basesystem", "15.4", ARCH_X86_64, "MODULE", false), + createTestSUSEProduct(user, "sle-manager-tools", "15", ARCH_X86_64, "SLE-M-T", false) + )); + } + + private void createSLES12Server() { + Server server = MinionServerFactoryTest.createTestMinionServer(user); + server.setServerArch(ServerFactory.lookupServerArchByName(ARCH_IBM_Z)); + ServerFactory.save(server); + + installSUSEProductsOnServer(server, Set.of( + createTestSUSEProduct(user, "sles", "12.3", ARCH_IBM_Z, "SLES-Z", true) + )); + } + + private void createOpenSUSEServer() { + Server server = MinionServerFactoryTest.createTestMinionServer(user); + server.setServerArch(ServerFactory.lookupServerArchByName(ARCH_X86_64)); + ServerFactory.save(server); + + systemEntitlementManager.addEntitlementToServer(server, EntitlementManager.MONITORING); + + installSUSEProductsOnServer(server, Set.of( + createTestSUSEProduct(user, "opensuse", "15.2", ARCH_X86_64, "OPENSUSE", true), + createTestSUSEProduct(user, "sle-manager-tools", "15", ARCH_X86_64, "SLE-M-T", false) + )); + } + + private void createSUSEManagerProxy() { + Server server = MinionServerFactoryTest.createTestMinionServer(user); + server.setServerArch(ServerFactory.lookupServerArchByName(ARCH_X86_64)); + ServerFactory.save(server); + + installSUSEProductsOnServer(server, Set.of( + createTestSUSEProduct(user, "suse-manager-proxy", "4.3", ARCH_X86_64, "SMP", true), + createTestSUSEProduct(user, "sle-module-basesystem", "15.4", ARCH_X86_64, "MODULE", false), + createTestSUSEProduct(user, "sle-module-server-applications", "15.4", ARCH_X86_64, "MODULE", false), + createTestSUSEProduct(user, "sle-module-suse-manager-proxy", "15.4", ARCH_X86_64, "MODULE", false) + )); + } + + private void createTraditionalClient() { + Server server = ServerFactoryTest.createUnentitledTestServer( + user, true, ServerFactoryTest.TYPE_SERVER_NORMAL, new Date() + ); + server.setServerArch(ServerFactory.lookupServerArchByName(ARCH_X86_64)); + ServerFactory.save(server); - Optional managedSystems = result.getResultForDimension(BillingDimension.MANAGED_SYSTEMS); - assertTrue(managedSystems.isPresent()); - managedSystems.ifPresent(dimensionResult -> assertEquals(2L, dimensionResult.getCount())); + systemEntitlementManager.setBaseEntitlement(server, EntitlementManager.MANAGEMENT); - Optional monitoringSystems = result.getResultForDimension(BillingDimension.MONITORING); - assertTrue(monitoringSystems.isPresent()); - monitoringSystems.ifPresent(dimensionResult -> assertEquals(0L, dimensionResult.getCount())); + installSUSEProductsOnServer(server, Set.of( + createTestSUSEProduct(user, "sles_sap", "12", ARCH_X86_64, "AiO", true), + createTestSUSEProduct(user, "sles-ltss", "12", ARCH_X86_64, "SLES12-GA-LTSS-X86", false), + createTestSUSEProduct(user, "sle-module-legacy", "12", ARCH_X86_64, "MODULE", false) + )); } } From 8acb0a3a783d2e12bef84acfef24e20d5bddd11e Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 28 Jun 2023 18:17:57 +0200 Subject: [PATCH 075/127] Hide ubuntu and debian products, if only RMT credentials are available --- .../com/redhat/rhn/common/util/Asserts.java | 11 +++ .../manager/content/ContentSyncManager.java | 7 ++ .../test/ContentSyncManagerPaygTest.java | 86 ++++++++++--------- .../redhat/rhn/testing/RhnBaseTestCase.java | 10 +++ 4 files changed, 75 insertions(+), 39 deletions(-) diff --git a/java/code/src/com/redhat/rhn/common/util/Asserts.java b/java/code/src/com/redhat/rhn/common/util/Asserts.java index 8ea74b9fb1a4..503e469db463 100644 --- a/java/code/src/com/redhat/rhn/common/util/Asserts.java +++ b/java/code/src/com/redhat/rhn/common/util/Asserts.java @@ -172,4 +172,15 @@ public static void assertEquals(int expected, int actual, "'"); } } + + /** + * Assert that coll does not contain elem + * @param coll a collection + * @param elem the element that should not be in the collection + */ + public static void assertNotContains(Collection coll, Object elem) { + if (coll.contains(elem)) { + fail("Expected " + elem + " to not be in " + coll); + } + } } diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index 70638bf7dc9f..1b54dfa2d69e 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -1651,6 +1651,13 @@ private List loadStaticTree(String tag) throws ContentSyncExce throw new ContentSyncException(e); } } + + // If we have only RMT credentials + if (!credentials.isEmpty() && credentials.stream().allMatch(c -> c.isTypeOf(Credentials.TYPE_CLOUD_RMT))) { + // Remove Ubuntu and Debian products until RMT supports them + tree.removeIf(productEntry -> productEntry.getChannelLabel().contains("amd64") || + productEntry.getParentChannelLabel().filter(label -> label.contains("amd64")).isPresent()); + } } return productTreeFix( tree.stream().filter(e -> e.getTags().isEmpty() || e.getTags().contains(tag)).collect(Collectors.toList()) diff --git a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java index b795bec0c594..50b9648356f2 100644 --- a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java +++ b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.manager.content.test; +import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; @@ -173,45 +174,52 @@ public boolean isPaygInstance() { List auth = SCCCachingFactory.lookupRepositoryAuth(); assertFalse(auth.isEmpty()); - Set reponames = auth.stream() - .filter(a -> a.cloudRmtAuth().isPresent()) - .map(SCCRepositoryAuth::getRepo) - .map(SCCRepository::getName) - .collect(Collectors.toSet()); - assertContains(reponames, "SLE-Product-SUSE-Manager-Server-4.2-Pool"); - assertContains(reponames, "SLE-Product-SUSE-Manager-Server-4.2-Updates"); - assertContains(reponames, "SLE-Product-SUSE-Manager-Server-4.3-Pool"); - assertContains(reponames, "SLE-Product-SUSE-Manager-Server-4.3-Updates"); - assertContains(reponames, "SLE-Module-Basesystem15-SP3-Pool"); - assertContains(reponames, "SLE-Module-Basesystem15-SP4-Pool"); - assertContains(reponames, "SLE-Manager-Tools12-Pool"); - assertContains(reponames, "SLE-Manager-Tools12-Updates"); - assertContains(reponames, "SLE-Manager-Tools15-Pool"); - assertContains(reponames, "SLE-Manager-Tools15-Updates"); - assertContains(reponames, "SLE-Manager-Tools-For-Micro5-Pool"); - assertContains(reponames, "SLE-Manager-Tools-For-Micro5-Updates"); - assertContains(reponames, "SLE-Product-SUSE-Manager-Proxy-4.3-Pool"); - assertContains(reponames, "SLE-Product-SUSE-Manager-Proxy-4.3-Updates"); - assertContains(reponames, "RES-7-SUSE-Manager-Tools"); - assertContains(reponames, "RES8-Manager-Tools-Pool"); - assertContains(reponames, "RES8-Manager-Tools-Updates"); - assertContains(reponames, "EL9-Manager-Tools-Pool"); - assertContains(reponames, "EL9-Manager-Tools-Updates"); - - reponames = auth.stream() - .filter(a -> a.noAuth().isPresent()) - .map(SCCRepositoryAuth::getRepo) - .map(SCCRepository::getName) - .collect(Collectors.toSet()); - assertContains(reponames, "rockylinux-8"); - assertContains(reponames, "rockylinux-9"); - assertContains(reponames, "oraclelinux7"); - assertContains(reponames, "oraclelinux8"); - assertContains(reponames, "oraclelinux9"); - assertContains(reponames, "almalinux8"); - assertContains(reponames, "almalinux9"); - assertContains(reponames, "debian-11-pool"); - assertContains(reponames, "ubuntu-2204-amd64-main"); + Set authRepos = auth.stream() + .filter(a -> a.cloudRmtAuth().isPresent()) + .map(SCCRepositoryAuth::getRepo) + .map(SCCRepository::getName) + .collect(Collectors.toSet()); + + assertAll("Repositories with auth", + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Server-4.2-Pool"), + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Server-4.2-Updates"), + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Server-4.3-Pool"), + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Server-4.3-Updates"), + () -> assertContains(authRepos, "SLE-Module-Basesystem15-SP3-Pool"), + () -> assertContains(authRepos, "SLE-Module-Basesystem15-SP4-Pool"), + () -> assertContains(authRepos, "SLE-Manager-Tools12-Pool"), + () -> assertContains(authRepos, "SLE-Manager-Tools12-Updates"), + () -> assertContains(authRepos, "SLE-Manager-Tools15-Pool"), + () -> assertContains(authRepos, "SLE-Manager-Tools15-Updates"), + () -> assertContains(authRepos, "SLE-Manager-Tools-For-Micro5-Pool"), + () -> assertContains(authRepos, "SLE-Manager-Tools-For-Micro5-Updates"), + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Proxy-4.3-Pool"), + () -> assertContains(authRepos, "SLE-Product-SUSE-Manager-Proxy-4.3-Updates"), + () -> assertContains(authRepos, "RES-7-SUSE-Manager-Tools"), + () -> assertContains(authRepos, "RES8-Manager-Tools-Pool"), + () -> assertContains(authRepos, "RES8-Manager-Tools-Updates"), + () -> assertContains(authRepos, "EL9-Manager-Tools-Pool"), + () -> assertContains(authRepos, "EL9-Manager-Tools-Updates") + ); + + Set noAuthRepos = auth.stream() + .filter(a -> a.noAuth().isPresent()) + .map(SCCRepositoryAuth::getRepo) + .map(SCCRepository::getName) + .collect(Collectors.toSet()); + + assertAll("Repositories without auth", + () -> assertContains(noAuthRepos, "rockylinux-8"), + () -> assertContains(noAuthRepos, "rockylinux-9"), + () -> assertContains(noAuthRepos, "oraclelinux7"), + () -> assertContains(noAuthRepos, "oraclelinux8"), + () -> assertContains(noAuthRepos, "oraclelinux9"), + () -> assertContains(noAuthRepos, "almalinux8"), + () -> assertContains(noAuthRepos, "almalinux9"), + // Ubuntu and Debian should be excluded until RMT supports them + () -> assertNotContains(noAuthRepos, "debian-11-pool"), + () -> assertNotContains(noAuthRepos, "ubuntu-2204-amd64-main") + ); } finally { wireMockServer.stop(); diff --git a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java index 4c3f638b796b..0a58b5f5f9a9 100644 --- a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java +++ b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java @@ -97,6 +97,16 @@ public static void assertContains(Collection coll, A elem) { assertTrue(coll.contains(elem)); } + /** + * Assert that coll does not contain elem + * @param element type + * @param coll a collection + * @param elem the element that should not be in the collection + */ + public static void assertNotContains(Collection coll, A elem) { + Asserts.assertNotContains(coll, elem); + } + /** * Assert that coll is not empty * @param coll the collection From 2b24bc4969163c4611472ecdbb1ea3198b178827 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 13:16:49 +0200 Subject: [PATCH 076/127] Add payg logic Signed-off-by: Miguel Sama --- .../action/systems/SPMigrationAction.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java index 6485519b3d8d..e739a03aa212 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems; +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.util.DatePicker; import com.redhat.rhn.common.util.DynamicComparator; @@ -40,6 +41,7 @@ import com.redhat.rhn.frontend.struts.RhnAction; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.distupgrade.DistUpgradeManager; +import com.redhat.rhn.manager.distupgrade.DistUpgradePaygException; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.rhnpackage.PackageManager; @@ -48,10 +50,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.DynaActionForm; +import org.apache.struts.action.*; import java.util.ArrayList; import java.util.Arrays; @@ -110,6 +109,7 @@ public class SPMigrationAction extends RhnAction { private static final String MSG_SCHEDULED_MIGRATION = "spmigration.message.scheduled"; private static final String MSG_SCHEDULED_DRYRUN = "spmigration.message.scheduled.dry-run"; + private static final String MSG_ERROR_PAYG_MIGRATION = "spmigration.message.payg.error"; /** * {@inheritDoc} @@ -321,7 +321,8 @@ else if (forward.getName().equals(SCHEDULE)) { DatePicker.YEAR_RANGE_POSITIVE); try { Long actionID = DistUpgradeManager.scheduleDistUpgrade(ctx.getCurrentUser(), - server, targetProductSet, channelIDs, dryRun, allowVendorChange, earliest); + server, targetProductSet, channelIDs, dryRun, allowVendorChange, earliest, + GlobalInstanceHolder.PAYG_MANAGER); // Display a message to the user String product = targetProductSet.getBaseProduct().getFriendlyName(); @@ -338,6 +339,22 @@ else if (forward.getName().equals(SCHEDULE)) { request.setAttribute(NO_MAINTENANCE_WINDOW, true); forward = actionMapping.findForward(CONFIRM); } + catch (DistUpgradePaygException e) { + Optional installedProducts = server.getInstalledProductSet(); + List migrationTargets = getMigrationTargets( + request, + installedProducts, + server.getServerArch().getCompatibleChannelArch(), + ctx.getCurrentUser() + ); + request.setAttribute(TARGET_PRODUCTS, migrationTargets); + + ActionErrors errors = new ActionErrors(); + getStrutsDelegate().addError(errors, MSG_ERROR_PAYG_MIGRATION); + getStrutsDelegate().saveMessages(request, errors); + + forward = actionMapping.findForward(TARGET); + } } return forward; From 7dd059b4a8d2126dffed28ad0065504e48d19a91 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 13:17:31 +0200 Subject: [PATCH 077/127] Add string for migration payg error Signed-off-by: Miguel Sama --- .../redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 6e0f66e8e503..c4fb5466c341 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8724,6 +8724,9 @@ Alternatively, you will want to download <strong>Incremental Channel Conte This system is scheduled for a dry run of the migration to <strong>{2}</strong>. Once the action completed successfully you can schedule the full migration <a href="/rhn/systems/details/history/Event.do?sid={0}&aid={1}">here</a> + + Product migrations in Pay-as-you-go instances is forbidden. + Run mgr-register From 28765f66b6955823776814638b2c8a7fd664daca Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 13:17:54 +0200 Subject: [PATCH 078/127] Add wrapper for payg logic Signed-off-by: Miguel Sama --- .../distupgrade/DistUpgradeManager.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index 607e6f654e30..2b35a0e1a6dc 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -49,6 +49,7 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.taskomatic.TaskomaticApiException; +import com.suse.cloud.CloudPaygManager; import com.suse.utils.Lists; import com.suse.utils.Opt; @@ -681,6 +682,34 @@ public static Long scheduleDistUpgrade(User user, Server server, return ActionManager.scheduleDistUpgrade(user, server, details, earliest).getId(); } + /** + * Schedule a distribution upgrade for a given server, allowing passing the PAYG flag. + * + * @param user the user who is scheduling + * @param server the server to migrate + * @param targetSet set of target products (base product and addons) + * @param channelIDs IDs of all channels to subscribe + * @param dryRun perform a dry run + * @param allowVendorChange allow vendor change during dist upgrade + * @param earliest earliest schedule date + * @param cloudPaygManager manager to see if this SUMA instance is PAYG + * @return the action ID + * @throws TaskomaticApiException if there was a Taskomatic error + * @throws DistUpgradePaygException + */ + public static Long scheduleDistUpgrade(User user, Server server, + SUSEProductSet targetSet, Collection channelIDs, + boolean dryRun, boolean allowVendorChange, Date earliest, + CloudPaygManager cloudPaygManager) + throws TaskomaticApiException, DistUpgradePaygException { + + if (cloudPaygManager.isPaygInstance()) { + throw new DistUpgradePaygException(); + } else { + return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); + } + } + /** * Remove incompatible migration targets compared to the installed products. * Write the failed products in the missingSuccesorExtensions set in case it should From 04ab7ac695acdc7a9ef5c37bafa106d81e5746d5 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 13:18:22 +0200 Subject: [PATCH 079/127] Add exception for migration payg Signed-off-by: Miguel Sama --- .../distupgrade/DistUpgradePaygException.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java new file mode 100644 index 000000000000..0b195e866643 --- /dev/null +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java @@ -0,0 +1,12 @@ +package com.redhat.rhn.manager.distupgrade; + +/** + * Exception thrown in case a product migration is attempted in a SUMA PAYG instace + */ +public class DistUpgradePaygException extends Exception{ + + /** + * Constructor + */ + DistUpgradePaygException() { super(); } +} From c32b40d920c90be2c9588004c164978b52731a66 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 16:05:36 +0200 Subject: [PATCH 080/127] Add code comments for future reference Signed-off-by: Miguel Sama --- .../redhat/rhn/manager/distupgrade/DistUpgradeManager.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index 2b35a0e1a6dc..d6ccaf83704b 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -704,6 +704,13 @@ public static Long scheduleDistUpgrade(User user, Server server, throws TaskomaticApiException, DistUpgradePaygException { if (cloudPaygManager.isPaygInstance()) { + /* + In the future we probably would like to allow product migrations to same product but different + version and just forbid migrating from different products. At the moment we are just blocking + all product migrations on SUMA PAYG instance. + I.e: Allow migration from SLES 15 SP4 to SLES 15 SP5. + Forbid migration from OpenSUSE Leap 15.4 to SLES 15 SP4 + */ throw new DistUpgradePaygException(); } else { return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); From 91fa710c1ee19bbfa9fa4ef4fa3f04cffdcfe9c7 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 16:06:05 +0200 Subject: [PATCH 081/127] Restrict product migration through API for PAYG Signed-off-by: Miguel Sama --- .../frontend/xmlrpc/system/SystemHandler.java | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 6dd593829913..4e3e1761950b 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -21,6 +21,7 @@ import static java.util.stream.Collectors.toSet; import com.redhat.rhn.FaultException; +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.common.client.ClientCertificate; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; @@ -159,6 +160,7 @@ import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.distupgrade.DistUpgradeException; import com.redhat.rhn.manager.distupgrade.DistUpgradeManager; +import com.redhat.rhn.manager.distupgrade.DistUpgradePaygException; import com.redhat.rhn.manager.entitlement.EntitlementManager; import com.redhat.rhn.manager.errata.ErrataManager; import com.redhat.rhn.manager.kickstart.KickstartFormatter; @@ -181,6 +183,7 @@ import com.redhat.rhn.manager.token.ActivationKeyManager; import com.redhat.rhn.taskomatic.TaskomaticApi; +import com.suse.cloud.CloudPaygManager; import com.suse.manager.api.ApiIgnore; import com.suse.manager.api.ReadOnly; import com.suse.manager.virtualization.VirtualizationActionHelper; @@ -239,6 +242,7 @@ public class SystemHandler extends BaseHandler { private SystemEntitlementManager systemEntitlementManager; private SystemManager systemManager; private final ServerGroupManager serverGroupManager; + private CloudPaygManager cloudPaygManager; /** * Instantiates a new system handler. @@ -257,6 +261,26 @@ public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSys this.systemEntitlementManager = systemEntitlementManagerIn; this.systemManager = systemManagerIn; this.serverGroupManager = serverGroupManagerIn; + this.cloudPaygManager = GlobalInstanceHolder.PAYG_MANAGER; + } + + /** + * Instantiates a new system handler for testing purposes. It allows to inject a fake CloudPaygManager object. + * @param taskomaticApiIn the taskomatic api + * @param xmlRpcSystemHelperIn the xml rpc system helper + * @param systemEntitlementManagerIn the system entitlement manager + * @param systemManagerIn the system manager + * @param serverGroupManagerIn + * @param cloudPaygManager fake CloudPaygManager for testing purposes + */ + public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSystemHelperIn, + SystemEntitlementManager systemEntitlementManagerIn, + SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn, + CloudPaygManager cloudPaygManager) { + this(taskomaticApiIn, xmlRpcSystemHelperIn, systemEntitlementManagerIn, systemManagerIn, serverGroupManagerIn); + if (cloudPaygManager != null) { + this.cloudPaygManager = cloudPaygManager; + } } /** @@ -7842,7 +7866,8 @@ public Long scheduleProductMigration(User loggedInUser, Integer sid, String targ channelIDs.add(channel.getId()); } return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, - targetProducts, channelIDs, dryRun, allowVendorChange, earliestOccurrence); + targetProducts, channelIDs, dryRun, allowVendorChange, + earliestOccurrence, cloudPaygManager); } // Consider alternatives (cloned channel trees) @@ -7852,13 +7877,19 @@ public Long scheduleProductMigration(User loggedInUser, Integer sid, String targ if (clonedBaseChannel.getLabel().equals(baseChannelLabel)) { channelIDs.addAll(alternatives.get(clonedBaseChannel)); return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, - targetProducts, channelIDs, dryRun, allowVendorChange, earliestOccurrence); + targetProducts, channelIDs, dryRun, allowVendorChange, + earliestOccurrence, cloudPaygManager); } } } catch (com.redhat.rhn.taskomatic.TaskomaticApiException e) { throw new TaskomaticApiException(e.getMessage()); } + catch (DistUpgradePaygException e) { + // We are not allowing product migration in SUMA PAYG instance + throw new FaultException(-1, "productMigrationNotAllowedPayg", + "Product migration in SUSE Manager PAYG is not allowed"); + } } // We didn't find target products if we are still here @@ -7944,7 +7975,8 @@ public Long scheduleDistUpgrade(User loggedInUser, Integer sid, List cha try { channelIDs = DistUpgradeManager.performChannelChecks(channels, loggedInUser); return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, null, - channelIDs, dryRun, allowVendorChange, earliestOccurrence); + channelIDs, dryRun, allowVendorChange, + earliestOccurrence, cloudPaygManager); } catch (DistUpgradeException e) { throw new FaultException(-1, "distUpgradeChannelError", e.getMessage()); @@ -7952,6 +7984,11 @@ public Long scheduleDistUpgrade(User loggedInUser, Integer sid, List cha catch (com.redhat.rhn.taskomatic.TaskomaticApiException e) { throw new TaskomaticApiException(e.getMessage()); } + catch (DistUpgradePaygException e) { + // We are not allowing product migration in SUMA PAYG instance + throw new FaultException(-1, "productMigrationNotAllowedPayg", + "Product migration in SUSE Manager PAYG is not allowed"); + } } /** * Method to list systems that require reboot From 24f9b5ad2fcc810231474c7d8589e3f8b0f1f7dd Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:32:37 +0200 Subject: [PATCH 082/127] Add changelog Signed-off-by: Miguel Sama --- ...java.changes.mikeletux.Manager-4.3-suma-payg-avoid-migrations | 1 + 1 file changed, 1 insertion(+) create mode 100644 java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-avoid-migrations diff --git a/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-avoid-migrations b/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-avoid-migrations new file mode 100644 index 000000000000..6f39790b057e --- /dev/null +++ b/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-avoid-migrations @@ -0,0 +1 @@ +- Restrict product migrations for PAYG From 0c92929ab2351cf00a03f4a5a21b330de40184a0 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 28 Jun 2023 16:42:56 +0200 Subject: [PATCH 083/127] Fix linting issues Signed-off-by: Miguel Sama --- .../action/systems/SPMigrationAction.java | 10 ++++++--- .../frontend/xmlrpc/system/SystemHandler.java | 8 +++---- .../distupgrade/DistUpgradeManager.java | 3 ++- .../distupgrade/DistUpgradePaygException.java | 21 +++++++++++++++++-- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java index e739a03aa212..ac7f2614aa14 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java @@ -50,7 +50,11 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts.action.*; +import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.DynaActionForm; import java.util.ArrayList; import java.util.Arrays; @@ -116,8 +120,8 @@ public class SPMigrationAction extends RhnAction { */ @Override public ActionForward execute(ActionMapping actionMapping, - ActionForm actionForm, HttpServletRequest request, - HttpServletResponse response) throws Exception { + ActionForm actionForm, HttpServletRequest request, + HttpServletResponse response) throws Exception { // Bind the server object to the request RequestContext ctx = new RequestContext(request); Server server = ctx.lookupAndBindServer(); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 4e3e1761950b..1fecd3832cc1 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -271,15 +271,15 @@ public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSys * @param systemEntitlementManagerIn the system entitlement manager * @param systemManagerIn the system manager * @param serverGroupManagerIn - * @param cloudPaygManager fake CloudPaygManager for testing purposes + * @param cloudPaygManagerIn fake CloudPaygManager for testing purposes */ public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSystemHelperIn, SystemEntitlementManager systemEntitlementManagerIn, SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn, - CloudPaygManager cloudPaygManager) { + CloudPaygManager cloudPaygManagerIn) { this(taskomaticApiIn, xmlRpcSystemHelperIn, systemEntitlementManagerIn, systemManagerIn, serverGroupManagerIn); - if (cloudPaygManager != null) { - this.cloudPaygManager = cloudPaygManager; + if (cloudPaygManagerIn != null) { + cloudPaygManager = cloudPaygManagerIn; } } diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index d6ccaf83704b..91b64e6a7cbf 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -712,7 +712,8 @@ public static Long scheduleDistUpgrade(User user, Server server, Forbid migration from OpenSUSE Leap 15.4 to SLES 15 SP4 */ throw new DistUpgradePaygException(); - } else { + } + else { return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); } } diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java index 0b195e866643..98cd426d70c1 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java @@ -1,12 +1,29 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + package com.redhat.rhn.manager.distupgrade; /** * Exception thrown in case a product migration is attempted in a SUMA PAYG instace */ -public class DistUpgradePaygException extends Exception{ +public class DistUpgradePaygException extends Exception { /** * Constructor */ - DistUpgradePaygException() { super(); } + public DistUpgradePaygException() { + super(); + } } From 1b839e59e7ea73963c3fd7d22540a9de93561c94 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:19:49 +0200 Subject: [PATCH 084/127] Change inheritance to DistUpgradeException Signed-off-by: Miguel Sama --- .../rhn/manager/distupgrade/DistUpgradePaygException.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java index 98cd426d70c1..25d9833e3f37 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java @@ -18,12 +18,12 @@ /** * Exception thrown in case a product migration is attempted in a SUMA PAYG instace */ -public class DistUpgradePaygException extends Exception { +public class DistUpgradePaygException extends DistUpgradeException { /** * Constructor */ - public DistUpgradePaygException() { - super(); + public DistUpgradePaygException(String message) { + super(message); } } From af21d1a9a27c73834eca411f20737194b005ea8e Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:20:16 +0200 Subject: [PATCH 085/127] Change method `scheduleDistUpgrade` signature Signed-off-by: Miguel Sama --- .../rhn/manager/distupgrade/DistUpgradeManager.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index 91b64e6a7cbf..c93e03506b53 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -692,7 +692,7 @@ public static Long scheduleDistUpgrade(User user, Server server, * @param dryRun perform a dry run * @param allowVendorChange allow vendor change during dist upgrade * @param earliest earliest schedule date - * @param cloudPaygManager manager to see if this SUMA instance is PAYG + * @param isPayg tells the method how to behave if SUMA is PAYG * @return the action ID * @throws TaskomaticApiException if there was a Taskomatic error * @throws DistUpgradePaygException @@ -700,10 +700,10 @@ public static Long scheduleDistUpgrade(User user, Server server, public static Long scheduleDistUpgrade(User user, Server server, SUSEProductSet targetSet, Collection channelIDs, boolean dryRun, boolean allowVendorChange, Date earliest, - CloudPaygManager cloudPaygManager) + boolean isPayg) throws TaskomaticApiException, DistUpgradePaygException { - if (cloudPaygManager.isPaygInstance()) { + if (isPayg) { /* In the future we probably would like to allow product migrations to same product but different version and just forbid migrating from different products. At the moment we are just blocking @@ -711,11 +711,10 @@ public static Long scheduleDistUpgrade(User user, Server server, I.e: Allow migration from SLES 15 SP4 to SLES 15 SP5. Forbid migration from OpenSUSE Leap 15.4 to SLES 15 SP4 */ - throw new DistUpgradePaygException(); - } - else { - return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); + throw new DistUpgradePaygException("In PAYG SUMA instances, products migrations is forbidden"); } + + return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); } /** From b9e3fc775b999b2dc727868821225d8059adb101 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:20:57 +0200 Subject: [PATCH 086/127] Remove second constructor and adapt the existing one Signed-off-by: Miguel Sama --- .../frontend/xmlrpc/system/SystemHandler.java | 53 ++++++++----------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 1fecd3832cc1..5a497d5c3496 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -247,40 +247,29 @@ public class SystemHandler extends BaseHandler { /** * Instantiates a new system handler. * - * @param taskomaticApiIn the taskomatic api - * @param xmlRpcSystemHelperIn the xml rpc system helper + * @param taskomaticApiIn the taskomatic api + * @param xmlRpcSystemHelperIn the xml rpc system helper * @param systemEntitlementManagerIn the system entitlement manager - * @param systemManagerIn the system manager + * @param systemManagerIn the system manager * @param serverGroupManagerIn + * @param cloudPaygManager the pay-as-you-go manager. If null, the one from GlobalInstanceHolder is used. */ public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSystemHelperIn, - SystemEntitlementManager systemEntitlementManagerIn, - SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn) { + SystemEntitlementManager systemEntitlementManagerIn, + SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn, + CloudPaygManager cloudPaygManager) { this.taskomaticApi = taskomaticApiIn; this.xmlRpcSystemHelper = xmlRpcSystemHelperIn; this.systemEntitlementManager = systemEntitlementManagerIn; this.systemManager = systemManagerIn; this.serverGroupManager = serverGroupManagerIn; - this.cloudPaygManager = GlobalInstanceHolder.PAYG_MANAGER; - } - - /** - * Instantiates a new system handler for testing purposes. It allows to inject a fake CloudPaygManager object. - * @param taskomaticApiIn the taskomatic api - * @param xmlRpcSystemHelperIn the xml rpc system helper - * @param systemEntitlementManagerIn the system entitlement manager - * @param systemManagerIn the system manager - * @param serverGroupManagerIn - * @param cloudPaygManagerIn fake CloudPaygManager for testing purposes - */ - public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSystemHelperIn, - SystemEntitlementManager systemEntitlementManagerIn, - SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn, - CloudPaygManager cloudPaygManagerIn) { - this(taskomaticApiIn, xmlRpcSystemHelperIn, systemEntitlementManagerIn, systemManagerIn, serverGroupManagerIn); - if (cloudPaygManagerIn != null) { - cloudPaygManager = cloudPaygManagerIn; + if (cloudPaygManager == null) { + this.cloudPaygManager = GlobalInstanceHolder.PAYG_MANAGER; + } + else { + this.cloudPaygManager = cloudPaygManager; } + } /** @@ -7867,7 +7856,7 @@ public Long scheduleProductMigration(User loggedInUser, Integer sid, String targ } return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, targetProducts, channelIDs, dryRun, allowVendorChange, - earliestOccurrence, cloudPaygManager); + earliestOccurrence, cloudPaygManager.isPaygInstance()); } // Consider alternatives (cloned channel trees) @@ -7878,7 +7867,7 @@ public Long scheduleProductMigration(User loggedInUser, Integer sid, String targ channelIDs.addAll(alternatives.get(clonedBaseChannel)); return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, targetProducts, channelIDs, dryRun, allowVendorChange, - earliestOccurrence, cloudPaygManager); + earliestOccurrence, cloudPaygManager.isPaygInstance()); } } } @@ -7976,7 +7965,12 @@ public Long scheduleDistUpgrade(User loggedInUser, Integer sid, List cha channelIDs = DistUpgradeManager.performChannelChecks(channels, loggedInUser); return DistUpgradeManager.scheduleDistUpgrade(loggedInUser, server, null, channelIDs, dryRun, allowVendorChange, - earliestOccurrence, cloudPaygManager); + earliestOccurrence, cloudPaygManager.isPaygInstance()); + } + catch (DistUpgradePaygException e) { + // We are not allowing product migration in SUMA PAYG instance + throw new FaultException(-1, "productMigrationNotAllowedPayg", + "Product migration in SUSE Manager PAYG is not allowed"); } catch (DistUpgradeException e) { throw new FaultException(-1, "distUpgradeChannelError", e.getMessage()); @@ -7984,11 +7978,6 @@ public Long scheduleDistUpgrade(User loggedInUser, Integer sid, List cha catch (com.redhat.rhn.taskomatic.TaskomaticApiException e) { throw new TaskomaticApiException(e.getMessage()); } - catch (DistUpgradePaygException e) { - // We are not allowing product migration in SUMA PAYG instance - throw new FaultException(-1, "productMigrationNotAllowedPayg", - "Product migration in SUSE Manager PAYG is not allowed"); - } } /** * Method to list systems that require reboot From 97a3c186b73d9539b9be5bc5d63385f7b96ed5d2 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:21:32 +0200 Subject: [PATCH 087/127] Use new SystemHandler constructor signature Signed-off-by: Miguel Sama --- .../code/src/com/redhat/rhn/frontend/xmlrpc/HandlerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/HandlerFactory.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/HandlerFactory.java index bf75e586cd71..59446e12caa2 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/HandlerFactory.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/HandlerFactory.java @@ -147,7 +147,7 @@ public static HandlerFactory getDefaultHandlerFactory() { ); ProxyHandler proxyHandler = new ProxyHandler(xmlRpcSystemHelper, systemManager); SystemHandler systemHandler = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, GlobalInstanceHolder.PAYG_MANAGER); factory.addHandler("actionchain", new ActionChainHandler()); factory.addHandler("activationkey", new ActivationKeyHandler(serverGroupManager)); From b419f893bc2f60a1017c64eb73c3f59b8f02f116 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:21:54 +0200 Subject: [PATCH 088/127] Remove passing cloud payg manager object Signed-off-by: Miguel Sama --- .../redhat/rhn/frontend/action/systems/SPMigrationAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java index ac7f2614aa14..af219293d95c 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java @@ -326,7 +326,7 @@ else if (forward.getName().equals(SCHEDULE)) { try { Long actionID = DistUpgradeManager.scheduleDistUpgrade(ctx.getCurrentUser(), server, targetProductSet, channelIDs, dryRun, allowVendorChange, earliest, - GlobalInstanceHolder.PAYG_MANAGER); + GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance()); // Display a message to the user String product = targetProductSet.getBaseProduct().getFriendlyName(); From d20202d55edfcaa6207f5455498a95e6b01fd556 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:22:43 +0200 Subject: [PATCH 089/127] Use new SystemHandler signature Signed-off-by: Miguel Sama --- .../software/test/ChannelSoftwareHandlerTest.java | 8 ++++---- .../xmlrpc/system/test/SystemHandlerPtfTest.java | 2 +- .../frontend/xmlrpc/system/test/SystemHandlerTest.java | 4 ++-- .../manager/action/test/MinionActionManagerTest.java | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java index 6da210dade54..6e48eda81049 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java @@ -132,7 +132,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase { private SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); private SystemHandler systemHandler = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); private ChannelSoftwareHandler handler = new ChannelSoftwareHandler(taskomaticApi, xmlRpcSystemHelper); private ErrataHandler errataHandler = new ErrataHandler(); @@ -325,7 +325,7 @@ public void testSetSystemChannelsBaseChannel() throws Exception { assertFalse(child2.isBaseChannel()); SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager); + serverGroupManager, null); int sid = server.getId().intValue(); int rc1 = sh.setBaseChannel(admin, sid, base.getLabel()); @@ -354,7 +354,7 @@ public void testSetSystemChannelsBaseChannel() throws Exception { @Test public void testSetBaseChannel() throws Exception { SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager); + serverGroupManager, null); Channel c1 = ChannelFactoryTest.createTestChannel(admin); Server server = ServerFactoryTest.createTestServer(admin, true); @@ -875,7 +875,7 @@ public void testChannelSubscription() throws Exception { childChan.setParentChannel(baseChan); SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager); + serverGroupManager, null); int return1 = sh.setBaseChannel(admin, server.getId().intValue(), baseChan.getLabel()); int return2 = sh.setChildChannels(admin, server.getId().intValue(), List.of(childChan.getLabel())); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java index 5df8478b5dda..8e53c61b28fe 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java @@ -121,7 +121,7 @@ public void setUp() throws Exception { SystemEntitlementManager entitlementManager = new SystemEntitlementManager(unentitler, entitler); SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); - handler = new SystemHandler(taskomaticApi, xmlRpcHelper, entitlementManager, systemManager, groupManager); + handler = new SystemHandler(taskomaticApi, xmlRpcHelper, entitlementManager, systemManager, groupManager, null); standard = PackageTest.createTestPackage(admin.getOrg()); standardUpdated = PackageTestUtils.newVersionOfPackage(standard, null, "2.0.0", null, admin.getOrg()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java index 440cf7a5390f..572e19136ddf 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java @@ -233,7 +233,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase { new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); private SystemHandler handler = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager); + serverGroupManager, null); @RegisterExtension protected final Mockery mockContext = new JUnit5Mockery() {{ @@ -3571,7 +3571,7 @@ public void testChangeProxy() throws Exception { private SystemHandler getMockedHandler() throws Exception { TaskomaticApi taskomaticMock = mockContext.mock(TaskomaticApi.class); SystemHandler systemHandler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); mockContext.checking(new Expectations() {{ allowing(taskomaticMock).scheduleActionExecution(with(any(Action.class))); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java b/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java index 7380ad5795f8..2a1ccc1f6add 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java @@ -151,7 +151,7 @@ public void testPackageInstallWithStagingInsideWindow() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); context().checking(new Expectations() { { Matcher> minionMatcher = AllOf.allOf(IsMapContaining.hasKey(minion1.getId())); @@ -202,7 +202,7 @@ public void testPackageInstallWithStagingBeforeWindow() throws Exception { SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); context().checking(new Expectations() { { Matcher> minionMatcher = @@ -254,7 +254,7 @@ public void testPackageInstallWithStagingAfterWindow() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); context().checking(new Expectations() { { exactly(1).of(taskomaticMock) @@ -305,7 +305,7 @@ public void testPackageInstallWithStagingBeforeWindowExceedingDuration() MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); context().checking(new Expectations() {{ Matcher> minionMatcher = AllOf.allOf(IsMapContaining.hasKey(minion1.getId())); @@ -356,7 +356,7 @@ public void testPackageInstallWithoutStaging() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager); + systemManager, serverGroupManager, null); context().checking(new Expectations() { { exactly(1).of(taskomaticMock) From 87e321f90d55e74043577fe2b05b66b3b1640585 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 5 Jul 2023 15:48:46 +0200 Subject: [PATCH 090/127] Fix linting Signed-off-by: Miguel Sama --- .../redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 8 ++++---- .../rhn/manager/distupgrade/DistUpgradeManager.java | 3 +-- .../rhn/manager/distupgrade/DistUpgradePaygException.java | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index 5a497d5c3496..b481f1da4296 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -252,22 +252,22 @@ public class SystemHandler extends BaseHandler { * @param systemEntitlementManagerIn the system entitlement manager * @param systemManagerIn the system manager * @param serverGroupManagerIn - * @param cloudPaygManager the pay-as-you-go manager. If null, the one from GlobalInstanceHolder is used. + * @param cloudPaygManagerIn the pay-as-you-go manager. If null, the one from GlobalInstanceHolder is used. */ public SystemHandler(TaskomaticApi taskomaticApiIn, XmlRpcSystemHelper xmlRpcSystemHelperIn, SystemEntitlementManager systemEntitlementManagerIn, SystemManager systemManagerIn, ServerGroupManager serverGroupManagerIn, - CloudPaygManager cloudPaygManager) { + CloudPaygManager cloudPaygManagerIn) { this.taskomaticApi = taskomaticApiIn; this.xmlRpcSystemHelper = xmlRpcSystemHelperIn; this.systemEntitlementManager = systemEntitlementManagerIn; this.systemManager = systemManagerIn; this.serverGroupManager = serverGroupManagerIn; - if (cloudPaygManager == null) { + if (cloudPaygManagerIn == null) { this.cloudPaygManager = GlobalInstanceHolder.PAYG_MANAGER; } else { - this.cloudPaygManager = cloudPaygManager; + this.cloudPaygManager = cloudPaygManagerIn; } } diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index c93e03506b53..a3c0dce64883 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -49,7 +49,6 @@ import com.redhat.rhn.manager.system.SystemManager; import com.redhat.rhn.taskomatic.TaskomaticApiException; -import com.suse.cloud.CloudPaygManager; import com.suse.utils.Lists; import com.suse.utils.Opt; @@ -695,7 +694,7 @@ public static Long scheduleDistUpgrade(User user, Server server, * @param isPayg tells the method how to behave if SUMA is PAYG * @return the action ID * @throws TaskomaticApiException if there was a Taskomatic error - * @throws DistUpgradePaygException + * @throws DistUpgradePaygException if the SUSE Manager instance is PAYG. */ public static Long scheduleDistUpgrade(User user, Server server, SUSEProductSet targetSet, Collection channelIDs, diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java index 25d9833e3f37..38e061b50775 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradePaygException.java @@ -22,6 +22,7 @@ public class DistUpgradePaygException extends DistUpgradeException { /** * Constructor + * @param message the cause */ public DistUpgradePaygException(String message) { super(message); From 53c544a3c5a3fc62240ca563a15df10df3a9f3f7 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 6 Jul 2023 10:10:40 +0200 Subject: [PATCH 091/127] Remove null parameter from `SystemHandler` constructor Signed-off-by: Miguel Sama --- .../software/test/ChannelSoftwareHandlerTest.java | 8 ++++---- .../xmlrpc/system/test/SystemHandlerPtfTest.java | 3 ++- .../frontend/xmlrpc/system/test/SystemHandlerTest.java | 4 ++-- .../manager/action/test/MinionActionManagerTest.java | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java index 6e48eda81049..327f0d6cc485 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/test/ChannelSoftwareHandlerTest.java @@ -132,7 +132,7 @@ public class ChannelSoftwareHandlerTest extends BaseHandlerTestCase { private SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); private SystemHandler systemHandler = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); private ChannelSoftwareHandler handler = new ChannelSoftwareHandler(taskomaticApi, xmlRpcSystemHelper); private ErrataHandler errataHandler = new ErrataHandler(); @@ -325,7 +325,7 @@ public void testSetSystemChannelsBaseChannel() throws Exception { assertFalse(child2.isBaseChannel()); SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager, null); + serverGroupManager, new CloudPaygManager()); int sid = server.getId().intValue(); int rc1 = sh.setBaseChannel(admin, sid, base.getLabel()); @@ -354,7 +354,7 @@ public void testSetSystemChannelsBaseChannel() throws Exception { @Test public void testSetBaseChannel() throws Exception { SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager, null); + serverGroupManager, new CloudPaygManager()); Channel c1 = ChannelFactoryTest.createTestChannel(admin); Server server = ServerFactoryTest.createTestServer(admin, true); @@ -875,7 +875,7 @@ public void testChannelSubscription() throws Exception { childChan.setParentChannel(baseChan); SystemHandler sh = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager, null); + serverGroupManager, new CloudPaygManager()); int return1 = sh.setBaseChannel(admin, server.getId().intValue(), baseChan.getLabel()); int return2 = sh.setChildChannels(admin, server.getId().intValue(), List.of(childChan.getLabel())); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java index 8e53c61b28fe..9d529b52fa86 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerPtfTest.java @@ -121,7 +121,8 @@ public void setUp() throws Exception { SystemEntitlementManager entitlementManager = new SystemEntitlementManager(unentitler, entitler); SystemManager systemManager = new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); - handler = new SystemHandler(taskomaticApi, xmlRpcHelper, entitlementManager, systemManager, groupManager, null); + handler = new SystemHandler(taskomaticApi, xmlRpcHelper, entitlementManager, systemManager, groupManager, + new CloudPaygManager()); standard = PackageTest.createTestPackage(admin.getOrg()); standardUpdated = PackageTestUtils.newVersionOfPackage(standard, null, "2.0.0", null, admin.getOrg()); diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java index 572e19136ddf..69de33f63bac 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java @@ -233,7 +233,7 @@ public class SystemHandlerTest extends BaseHandlerTestCase { new SystemManager(ServerFactory.SINGLETON, ServerGroupFactory.SINGLETON, saltApi); private SystemHandler handler = new SystemHandler(taskomaticApi, xmlRpcSystemHelper, systemEntitlementManager, systemManager, - serverGroupManager, null); + serverGroupManager, new CloudPaygManager()); @RegisterExtension protected final Mockery mockContext = new JUnit5Mockery() {{ @@ -3571,7 +3571,7 @@ public void testChangeProxy() throws Exception { private SystemHandler getMockedHandler() throws Exception { TaskomaticApi taskomaticMock = mockContext.mock(TaskomaticApi.class); SystemHandler systemHandler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); mockContext.checking(new Expectations() {{ allowing(taskomaticMock).scheduleActionExecution(with(any(Action.class))); diff --git a/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java b/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java index 2a1ccc1f6add..2b005b8fdba8 100644 --- a/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/action/test/MinionActionManagerTest.java @@ -151,7 +151,7 @@ public void testPackageInstallWithStagingInsideWindow() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); context().checking(new Expectations() { { Matcher> minionMatcher = AllOf.allOf(IsMapContaining.hasKey(minion1.getId())); @@ -202,7 +202,7 @@ public void testPackageInstallWithStagingBeforeWindow() throws Exception { SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); context().checking(new Expectations() { { Matcher> minionMatcher = @@ -254,7 +254,7 @@ public void testPackageInstallWithStagingAfterWindow() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); context().checking(new Expectations() { { exactly(1).of(taskomaticMock) @@ -305,7 +305,7 @@ public void testPackageInstallWithStagingBeforeWindowExceedingDuration() MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); context().checking(new Expectations() {{ Matcher> minionMatcher = AllOf.allOf(IsMapContaining.hasKey(minion1.getId())); @@ -356,7 +356,7 @@ public void testPackageInstallWithoutStaging() throws Exception { MinionActionManager.setTaskomaticApi(taskomaticMock); SystemHandler handler = new SystemHandler(taskomaticMock, xmlRpcSystemHelper, systemEntitlementManager, - systemManager, serverGroupManager, null); + systemManager, serverGroupManager, new CloudPaygManager()); context().checking(new Expectations() { { exactly(1).of(taskomaticMock) From 4cace478dc8112d1ae606c90587da53e6154d68c Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 17 Jul 2023 18:42:49 +0200 Subject: [PATCH 092/127] Hide ssh data from localhost in payg Signed-off-by: Miguel Sama --- web/html/src/manager/admin/payg/payg.tsx | 51 ++++++++++++++---------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/web/html/src/manager/admin/payg/payg.tsx b/web/html/src/manager/admin/payg/payg.tsx index ca56e9526ce7..1cdd7f3f0d1b 100644 --- a/web/html/src/manager/admin/payg/payg.tsx +++ b/web/html/src/manager/admin/payg/payg.tsx @@ -104,28 +104,35 @@ const Payg = (props: Props) => { cancelAction(); }} /> - { - setPayg(projectWithNewProperties); - cancelAction(); - }} - /> - { - setPayg(projectWithNewProperties); - cancelAction(); - }} - /> + + {!props.readOnly && + <> + { + setPayg(projectWithNewProperties); + cancelAction(); + }} + /> + + { + setPayg(projectWithNewProperties); + cancelAction(); + }} + /> + + } + ); }; From e8edc31732c1946f7a4abed2b5da7169d99ad520 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 18 Jul 2023 12:13:13 +0200 Subject: [PATCH 093/127] Add changelog and solve linting issues Signed-off-by: Miguel Sama --- web/html/src/manager/admin/payg/payg.tsx | 55 +++++++++---------- ...b.changes.mikeletux.hide-ssh-localhost-tab | 1 + 2 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 web/spacewalk-web.changes.mikeletux.hide-ssh-localhost-tab diff --git a/web/html/src/manager/admin/payg/payg.tsx b/web/html/src/manager/admin/payg/payg.tsx index 1cdd7f3f0d1b..0e72f7000297 100644 --- a/web/html/src/manager/admin/payg/payg.tsx +++ b/web/html/src/manager/admin/payg/payg.tsx @@ -105,34 +105,33 @@ const Payg = (props: Props) => { }} /> - {!props.readOnly && - <> - { - setPayg(projectWithNewProperties); - cancelAction(); - }} - /> - - { - setPayg(projectWithNewProperties); - cancelAction(); - }} - /> - - } - + {!props.readOnly && ( + <> + { + setPayg(projectWithNewProperties); + cancelAction(); + }} + /> + + { + setPayg(projectWithNewProperties); + cancelAction(); + }} + /> + + )} ); }; diff --git a/web/spacewalk-web.changes.mikeletux.hide-ssh-localhost-tab b/web/spacewalk-web.changes.mikeletux.hide-ssh-localhost-tab new file mode 100644 index 000000000000..aa5ec7cddafb --- /dev/null +++ b/web/spacewalk-web.changes.mikeletux.hide-ssh-localhost-tab @@ -0,0 +1 @@ +- Hide SSH info for `localhost` in Pay-as-you-go section From 26ea52ac199abbd604d58eb2cfe4f7fabf180ea3 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 17 Jul 2023 12:36:54 +0200 Subject: [PATCH 094/127] Add code to avoid sending SCC info about PAYG instances Signed-off-by: Miguel Sama --- .../com/suse/scc/SCCSystemRegistrationManager.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java/code/src/com/suse/scc/SCCSystemRegistrationManager.java b/java/code/src/com/suse/scc/SCCSystemRegistrationManager.java index 09521b6d26d8..aeada7afe9d6 100644 --- a/java/code/src/com/suse/scc/SCCSystemRegistrationManager.java +++ b/java/code/src/com/suse/scc/SCCSystemRegistrationManager.java @@ -147,7 +147,14 @@ public void register(List items, Credentials primaryCredential) items.forEach(cacheItem -> { try { Credentials itemCredentials = cacheItem.getOptCredentials().orElse(primaryCredential); - if (cacheItem.getOptServer().filter(s -> s.isForeign()).isEmpty()) { + /* + If a system is PAYG, we don't want to send (at least for now) information to SCC + so that the customer is not charged twice for the same machine. In the future we'll + send the machine with the flag `is_payg` set to true, but that will be done when the SCC + team supports it. + */ + if (cacheItem.getOptServer().filter(s -> s.isForeign()).isEmpty() && + cacheItem.getOptServer().filter(s -> s.isPayg()).isEmpty()) { LOG.debug("Forward registration of {}", cacheItem); SCCSystemCredentialsJson systemCredentials = sccClient.createSystem( getPayload(cacheItem), @@ -157,7 +164,7 @@ public void register(List items, Credentials primaryCredential) cacheItem.setSccLogin(systemCredentials.getLogin()); cacheItem.setSccPasswd(systemCredentials.getPassword()); } - // Foreign systems will not be send to SCC + // Foreign systems and PAYG will not be sent to SCC // but we need the entry in case it is a hypervisor and we need to send // virtualization host data to SCC cacheItem.setSccRegistrationRequired(false); From b71a7eb0eec9f38b78012e93c2e1bdb60b4badf9 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 17 Jul 2023 12:37:24 +0200 Subject: [PATCH 095/127] Add test for PAYG instances Signed-off-by: Miguel Sama --- .../SCCSystemRegistrationManagerTest.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java b/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java index 42dd54445769..b2909ae54629 100644 --- a/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java +++ b/java/code/src/com/suse/scc/test/SCCSystemRegistrationManagerTest.java @@ -148,6 +148,36 @@ public void deleteSystem(long id, String username, String password) { assertEquals(0, itemsAfterDeregistration.size()); } + @Test + public void sccSystemRegistrationLifecycleForPAYGInstance() throws Exception { + Server testSystem = ServerTestUtils.createTestSystem(); + ServerInfo serverInfo = testSystem.getServerInfo(); + serverInfo.setCheckin(new Date(0)); // 1970-01-01 00:00:00 UTC + testSystem.setServerInfo(serverInfo); + testSystem.setPayg(true); + + SCCWebClient sccWebClient = new SCCWebClient(new SCCConfig( + new URI("https://localhost"), "username", "password", "uuid")); + + SCCSystemRegistrationManager sccSystemRegistrationManager = new SCCSystemRegistrationManager(sccWebClient); + SCCCachingFactory.initNewSystemsToForward(); + + List allUnregistered = SCCCachingFactory.findSystemsToForwardRegistration(); + List testSystems = allUnregistered.stream() + .filter(i -> i.getOptServer().get().equals(testSystem)) + .collect(Collectors.toList()); + + Credentials credentials = CredentialsFactory.createSCCCredentials(); + credentials.setUsername("username"); + credentials.setPassword("password"); + credentials.setUrl("https://scc.suse.com"); + CredentialsFactory.storeCredentials(credentials); + + sccSystemRegistrationManager.register(testSystems, credentials); + List afterRegistration = SCCCachingFactory.findSystemsToForwardRegistration(); + assertEquals(allUnregistered.size() - 1, afterRegistration.size()); + } + @Test public void testUpdateSystems() throws Exception { Path tmpSaltRoot = Files.createTempDirectory("salt"); From 97ae8cd7fcb452050ea595eb555307f97f4d345a Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Mon, 17 Jul 2023 12:50:08 +0200 Subject: [PATCH 096/127] Add changelog Signed-off-by: Miguel Sama --- java/spacewalk-java.changes.mikeletux.send-data-scc | 1 + 1 file changed, 1 insertion(+) create mode 100644 java/spacewalk-java.changes.mikeletux.send-data-scc diff --git a/java/spacewalk-java.changes.mikeletux.send-data-scc b/java/spacewalk-java.changes.mikeletux.send-data-scc new file mode 100644 index 000000000000..8236bf86db40 --- /dev/null +++ b/java/spacewalk-java.changes.mikeletux.send-data-scc @@ -0,0 +1 @@ +- Avoid sending data to SCC about PAYG instances From 8c8e087bc9d082e2d27768ccfc1291040fc0b2af Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Thu, 20 Jul 2023 16:29:47 +0200 Subject: [PATCH 097/127] change billing api datastructure --- ...nges.mc.Manager-4.3-suma-payg-change-metric-api | 1 + python/billingdataservice/billingdataservice.py | 4 ++-- python/billingdataservice/tests/test_billing.py | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-change-metric-api diff --git a/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-change-metric-api b/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-change-metric-api new file mode 100644 index 000000000000..e34c59b5719f --- /dev/null +++ b/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-change-metric-api @@ -0,0 +1 @@ +- change billing api datastructure diff --git a/python/billingdataservice/billingdataservice.py b/python/billingdataservice/billingdataservice.py index 8a630a4c53bc..e897dd9af38a 100644 --- a/python/billingdataservice/billingdataservice.py +++ b/python/billingdataservice/billingdataservice.py @@ -36,7 +36,7 @@ def index(): _query_metering_data = rhnSQL.Statement(""" - SELECT r.dimension, r.count + SELECT r.dimension usage_metric, r.count FROM susePaygDimensionResult r WHERE r.computation_id = (SELECT c.id FROM susePaygDimensionComputation c @@ -50,4 +50,4 @@ def metering(): h = rhnSQL.prepare(_query_metering_data) h.execute() result = h.fetchall_dict() or [] - return json.dumps({ "dimensions" : result}) + return json.dumps({ "usage_metrics" : result}) diff --git a/python/billingdataservice/tests/test_billing.py b/python/billingdataservice/tests/test_billing.py index f45108aa92ea..b659234d38ff 100644 --- a/python/billingdataservice/tests/test_billing.py +++ b/python/billingdataservice/tests/test_billing.py @@ -13,7 +13,7 @@ @patch("billingdataservice.rhnSQL.Statement", MagicMock()) @pytest.fixture def client(): - testdata1 = [{"dimension": "1", "count": "10"}, {"dimension": "2", "count": "5"}] + testdata1 = [{"usage_metric": "managed_systems", "count": "10"}, {"usage_metric": "monitoring", "count": "5"}] client = billingdataservice.app.test_client() with patch( "billingdataservice.rhnSQL.fetchone_dict", @@ -32,7 +32,7 @@ def test_index(client): def test_metering(client): """Call metering API""" - mock_fetchall_dict = MagicMock(name="mock2", return_value=[{"dimension": "1", "count": "10"}, {"dimension": "2", "count": "5"}]) + mock_fetchall_dict = MagicMock(name="mock2", return_value=[{"usage_metric": "managed_systems", "count": "10"}, {"usage_metric": "monitoring", "count": "5"}]) mock_cursor = MagicMock(name="mock1") mock_cursor.fetchall_dict = mock_fetchall_dict @@ -40,12 +40,12 @@ def test_metering(client): rv = client.get('/metering') assert rv.status_code == 200 r = json.loads(rv.data) - assert "dimensions" in r - for dim in r["dimensions"]: - assert "dimension" in dim - if dim["dimension"] == "1": + assert "usage_metrics" in r + for dim in r["usage_metrics"]: + assert "usage_metric" in dim + if dim["usage_metric"] == "managed_systems": assert dim["count"] == "10" - elif dim["dimension"] == "2": + elif dim["usage_metric"] == "monitoring": assert dim["count"] == "5" else: assert False From d7e88d863bb1e1c1572212c5c368b8e6ccc31fb0 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 5 Jul 2023 12:09:29 +0200 Subject: [PATCH 098/127] Retrieved and stored the additional headers for accessing RMT APIs --- .../test/ContentSyncManagerPaygTest.java | 2 +- .../task/payg/PaygAuthDataExtractor.java | 11 ++++--- .../task/payg/PaygAuthDataProcessor.java | 12 +++++-- .../task/payg/beans/PaygInstanceInfo.java | 17 +++++----- .../payg/script/payg_extract_repo_data.py | 32 +++++++++++++++++-- .../payg/test/PaygAuthDataProcessorTest.java | 3 +- .../payg/test/PaygUpdateAuthTaskTest.java | 3 +- ...ava.changes.mackdk.4.3-allow-sync-with-rmt | 1 + 8 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt diff --git a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java index 50b9648356f2..c46dde7feb68 100644 --- a/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java +++ b/java/code/src/com/redhat/rhn/manager/content/test/ContentSyncManagerPaygTest.java @@ -97,7 +97,7 @@ protected PaygInstanceInfo extractAuthDataLocal() { rmtHost.put("ip", "18.156.40.199"); rmtHost.put("server_ca", "-----BEGIN CERTIFICATE-----"); - return new PaygInstanceInfo(products, basicAuth, headerAuth, rmtHost); + return new PaygInstanceInfo(products, basicAuth, List.of(headerAuth), rmtHost); } }; PAYG_DATA_TASK.setPaygDataExtractor(paygAuthDataExtractorMock); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java index aacc47adcde3..8c6f99b2d711 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java @@ -56,10 +56,10 @@ public class PaygAuthDataExtractor { private static final Logger LOG = LogManager.getLogger(PaygAuthDataExtractor.class); - private final Gson GSON = new GsonBuilder() - .registerTypeAdapterFactory(new OptionalTypeAdapterFactory()) - .serializeNulls() - .create(); + private static final Gson GSON = new GsonBuilder() + .registerTypeAdapterFactory(new OptionalTypeAdapterFactory()) + .serializeNulls() + .create(); private PaygInstanceInfo processOutput(int exitStatus, String error, String output) { if (exitStatus != 0 || error.length() > 0) { @@ -102,7 +102,7 @@ private PaygInstanceInfo extractAuthDataSSH(PaygSshData instance) throws Excepti sshBastion.addIdentity("bastionkey", instance.getBastionKey().getBytes(), null, bastionAuthKeyPassIn.getBytes()); } - Integer bastionSshPortIn = instance.getBastionPort() != null ? instance.getBastionPort() : 22; + int bastionSshPortIn = instance.getBastionPort() != null ? instance.getBastionPort() : 22; sessionBastion = sshBastion.getSession(instance.getBastionUsername(), instance.getBastionHost(), bastionSshPortIn); if (!StringUtils.isEmpty(instance.getBastionPassword())) { @@ -240,6 +240,7 @@ public PaygInstanceInfo extractAuthData(PaygSshData instance) throws Exception { .map(p -> new PaygProductInfo(p.getName(), p.getVersion(), p.getArch().getLabel())) .collect(Collectors.toList()); paygInstanceInfo.getProducts().addAll(slemtProductInfos); + return paygInstanceInfo; } else { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java index 24e44ed0813b..2b206f9a5682 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java @@ -31,6 +31,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -126,10 +127,15 @@ private Credentials processAndGetCredentials(PaygSshData instance, PaygInstanceI URI credentialsURI = new URI("https", paygData.getRmtHost().get("hostname"), "/repo", null); credentials.setUrl(credentialsURI.toString()); - if (paygData.getHeaderAuth() != null && paygData.getHeaderAuth().contains(":")) { - String[] headSplit = paygData.getHeaderAuth().split(":", 2); + List paygDataHeaders = paygData.getHeaders(); + if (CollectionUtils.isNotEmpty(paygDataHeaders)) { Map headers = new HashMap<>(); - headers.put(headSplit[0], headSplit[1]); + + paygDataHeaders.stream() + .filter(header -> header.contains(":")) + .map(header -> header.split(":", 2)) + .forEach(split -> headers.put(split[0], split[1])); + credentials.setExtraAuthData(GSON.toJson(headers).getBytes()); } credentials.setPaygSshData(instance); diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/beans/PaygInstanceInfo.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/beans/PaygInstanceInfo.java index bf20bde82f49..23243e304a08 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/beans/PaygInstanceInfo.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/beans/PaygInstanceInfo.java @@ -17,6 +17,7 @@ import com.google.gson.annotations.SerializedName; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -28,7 +29,7 @@ public class PaygInstanceInfo { @SerializedName("basic_auth") private Map basicAuth; @SerializedName("header_auth") - private String headerAuth; + private List headers; @SerializedName("rmt_host") private Map rmtHost; @@ -36,15 +37,15 @@ public class PaygInstanceInfo { * Constructor with all parameters * @param productsIn * @param basicAuthIn - * @param headerAuthIn + * @param headersIn * @param rmtHostIn */ public PaygInstanceInfo(List productsIn, Map basicAuthIn, - String headerAuthIn, Map rmtHostIn) { + List headersIn, Map rmtHostIn) { this.products = productsIn; this.basicAuth = basicAuthIn; - this.headerAuth = headerAuthIn; + this.headers = new ArrayList<>(headersIn); this.rmtHost = rmtHostIn; } @@ -64,12 +65,12 @@ public void setBasicAuth(Map basicAuthIn) { this.basicAuth = basicAuthIn; } - public String getHeaderAuth() { - return headerAuth; + public List getHeaders() { + return headers; } - public void setHeaderAuth(String headerAuthIn) { - this.headerAuth = headerAuthIn; + public void setHeaders(List headersIn) { + this.headers = headersIn; } public Map getRmtHost() { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py b/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py index 3fa10bf3ffb7..be5a94489ecf 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py @@ -13,6 +13,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +import csv import subprocess import xml.etree.ElementTree as ET from urllib.parse import urlparse, parse_qs @@ -21,6 +22,7 @@ from pathlib import Path import glob import os +import platform from collections import namedtuple INPUT_TEMPLATE = """RESOLVEURL @@ -32,6 +34,7 @@ CREDENTIALS_NAME = "SCCcredentials" + def system_exit(code, messages=None): "Exit with a code and optional message(s). Saved a few lines of code." @@ -39,11 +42,14 @@ def system_exit(code, messages=None): print(message, file=sys.stderr) sys.exit(code) + def is_payg_instance(): return os.path.isfile('/usr/sbin/registercloudguest') + SuseCloudInfo = namedtuple('SuseCloudInfo', ['header_auth', 'hostname']) + def _get_suse_cloud_info(): input = INPUT_TEMPLATE % (CREDENTIALS_NAME, "/") try: @@ -55,7 +61,26 @@ def _get_suse_cloud_info(): _, header_auth, _, repository_url = full_output repository_url_parsed = urlparse(repository_url) - return SuseCloudInfo(header_auth, repository_url_parsed.netloc) + instance_identification = _get_instance_identification() + + return SuseCloudInfo(instance_identification + [header_auth], repository_url_parsed.netloc) + + +def _get_instance_identification(): + path = next((p for p in map(lambda f: Path(f), ["/etc/os-release", "/usr/lib/os-release"]) if p.exists()), None) + if path is None: + return [] + + with open(path) as stream: + reader = csv.reader(stream, delimiter="=") + os_release = dict(reader) + + return [ + "X-Instance-Identifier:" + os_release["NAME"], + "X-Instance-Version:" + os_release["VERSION_ID"], + "X-Instance-Arch:" + platform.machine() + ] + def _extract_http_auth(credentials): credentials_file = '/etc/zypp/credentials.d/' + credentials @@ -72,6 +97,7 @@ def _extract_http_auth(credentials): password = var.strip() return {"username": username, "password": password} + def _extract_rmt_server_info(netloc): try: # we need to find the IP address, since it is not resolvable in any DNS. It is hardcoded in the hosts file @@ -107,6 +133,7 @@ def _get_installed_suse_products(): products.append(product) return products + def load_instance_info(): header_auth, hostname = _get_suse_cloud_info() @@ -119,6 +146,7 @@ def load_instance_info(): "header_auth": header_auth, "rmt_host": rmt_host_data} + def main(): if not is_payg_instance(): system_exit(1, ["instance is not pay-as-you-go"]) @@ -145,4 +173,4 @@ def main(): # 4- unable to get ip for repository server # 5- repository credentials file not found # 6- CA file for cloud RMT server not found -# 9- generic error \ No newline at end of file +# 9- generic error diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygAuthDataProcessorTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygAuthDataProcessorTest.java index c1181b217a95..89d29dd7b2df 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygAuthDataProcessorTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygAuthDataProcessorTest.java @@ -236,7 +236,6 @@ private PaygInstanceInfo createPaygInstanceInfo() { rmtHost.put("ip", "18.156.40.199"); rmtHost.put("server_ca", "-----BEGIN CERTIFICATE-----"); - PaygInstanceInfo info = new PaygInstanceInfo(products, basicAuth, headerAuth, rmtHost); - return info; + return new PaygInstanceInfo(products, basicAuth, List.of(headerAuth), rmtHost); } } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygUpdateAuthTaskTest.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygUpdateAuthTaskTest.java index 20c646fb6461..a10a94327676 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygUpdateAuthTaskTest.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/test/PaygUpdateAuthTaskTest.java @@ -396,7 +396,6 @@ private PaygInstanceInfo createPaygInstanceInfo() { rmtHost.put("ip", "18.156.40.199"); rmtHost.put("server_ca", "-----BEGIN CERTIFICATE-----"); - PaygInstanceInfo info = new PaygInstanceInfo(products, basicAuth, headerAuth, rmtHost); - return info; + return new PaygInstanceInfo(products, basicAuth, List.of(headerAuth), rmtHost); } } diff --git a/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt b/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt new file mode 100644 index 000000000000..69abae38310c --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt @@ -0,0 +1 @@ +- Extracted additional authentication information needed for PAYG From 8dcb57349411cbf8388917b0f5fff6a26de78ca9 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 19 Jul 2023 17:30:25 +0200 Subject: [PATCH 099/127] Store the PAYG products to sync properly --- .../common/hibernate/AnnotationRegistry.java | 2 + .../cloudpayg/PaygCredentialsProduct.java | 169 +++++++++++++++ .../domain/cloudpayg/PaygProductFactory.java | 194 ++++++++++++++++++ .../rhn/domain/cloudpayg/PaygSshData.java | 10 + .../domain/credentials/Credentials.hbm.xml | 6 + .../rhn/domain/credentials/Credentials.java | 12 ++ .../domain/product/SUSEProductFactory.java | 29 +-- .../manager/content/ContentSyncManager.java | 13 ++ .../task/payg/PaygAuthDataExtractor.java | 30 +-- .../task/payg/PaygAuthDataProcessor.java | 75 ++----- .../common/tables/susePaygProduct.sql | 30 +++ ...ema.changes.mackdk.4.3-allow-sync-with-rmt | 1 + .../202-payg-products.sql | 19 ++ 13 files changed, 481 insertions(+), 109 deletions(-) create mode 100644 java/code/src/com/redhat/rhn/domain/cloudpayg/PaygCredentialsProduct.java create mode 100644 java/code/src/com/redhat/rhn/domain/cloudpayg/PaygProductFactory.java create mode 100644 schema/spacewalk/common/tables/susePaygProduct.sql create mode 100644 schema/spacewalk/susemanager-schema.changes.mackdk.4.3-allow-sync-with-rmt create mode 100644 schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/202-payg-products.sql diff --git a/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java b/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java index 562c4f951035..4fd9799bfe5d 100644 --- a/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java +++ b/java/code/src/com/redhat/rhn/common/hibernate/AnnotationRegistry.java @@ -15,6 +15,7 @@ package com.redhat.rhn.common.hibernate; import com.redhat.rhn.domain.cloudpayg.CloudRmtHost; +import com.redhat.rhn.domain.cloudpayg.PaygCredentialsProduct; import com.redhat.rhn.domain.cloudpayg.PaygSshData; import com.redhat.rhn.domain.contentmgmt.ContentEnvironment; import com.redhat.rhn.domain.contentmgmt.ContentFilter; @@ -160,6 +161,7 @@ private AnnotationRegistry() { Pillar.class, CloudRmtHost.class, PaygSshData.class, + PaygCredentialsProduct.class, Task.class, RecurringHighstate.class, RecurringState.class, diff --git a/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygCredentialsProduct.java b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygCredentialsProduct.java new file mode 100644 index 000000000000..3fb4d96d94e8 --- /dev/null +++ b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygCredentialsProduct.java @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.domain.cloudpayg; + +import com.redhat.rhn.domain.BaseDomainHelper; +import com.redhat.rhn.domain.credentials.Credentials; +import com.redhat.rhn.taskomatic.task.payg.beans.PaygProductInfo; + +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQuery; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; + +@Entity +@Table(name = "susePaygProduct") +@NamedQuery( + name = "PaygCredentialsProduct.listByCredentials", + query = "SELECT p FROM com.redhat.rhn.domain.cloudpayg.PaygCredentialsProduct AS p WHERE p.credentials = :creds" +) +@NamedQuery( + name = "PaygCredentialsProduct.deleteByCredentials", + query = "DELETE FROM com.redhat.rhn.domain.cloudpayg.PaygCredentialsProduct AS p WHERE p.credentials = :creds" +) +public class PaygCredentialsProduct extends BaseDomainHelper { + + private Long id; + + private Credentials credentials; + + private String name; + + private String version; + + private String arch; + + /** + * Default constructor for hibernate + */ + protected PaygCredentialsProduct() { + } + + /** + * Create an instance with the given credentials and product + * @param credentialsIn the credential + * @param productInfoIn the product + */ + PaygCredentialsProduct(Credentials credentialsIn, PaygProductInfo productInfoIn) { + this.credentials = credentialsIn; + this.name = productInfoIn.getName(); + this.version = productInfoIn.getVersion(); + this.arch = productInfoIn.getArch(); + } + + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "susePaygProduct_seq") + @SequenceGenerator(name = "susePaygProduct_seq", sequenceName = "susePaygProduct_id_seq", allocationSize = 1) + public Long getId() { + return id; + } + + public void setId(Long idIn) { + this.id = idIn; + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "credentials_id", referencedColumnName = "id") + public Credentials getCredentials() { + return credentials; + } + + public void setCredentials(Credentials credentialsIn) { + this.credentials = credentialsIn; + } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String nameIn) { + this.name = nameIn; + } + + @Column(name = "version") + public String getVersion() { + return version; + } + + public void setVersion(String versionIn) { + this.version = versionIn; + } + + @Column(name = "arch") + public String getArch() { + return arch; + } + + public void setArch(String archIn) { + this.arch = archIn; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (!(o instanceof PaygCredentialsProduct)) { + return false; + } + + PaygCredentialsProduct that = (PaygCredentialsProduct) o; + + return new EqualsBuilder() + .append(credentials, that.credentials) + .append(name, that.getName()) + .append(version, that.getVersion()) + .append(arch, that.getArch()) + .isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append(credentials) + .append(name) + .append(version) + .append(arch) + .toHashCode(); + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("id", id) + .append("credentials", credentials) + .append("name", name) + .append("version", version) + .append("arch", arch) + .append("created", getCreated()) + .append("modified", getModified()) + .toString(); + } +} diff --git a/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygProductFactory.java b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygProductFactory.java new file mode 100644 index 000000000000..fc77a46863f8 --- /dev/null +++ b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygProductFactory.java @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2023 SUSE LLC + * + * This software is licensed to you under the GNU General Public License, + * version 2 (GPLv2). There is NO WARRANTY for this software, express or + * implied, including the implied warranties of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 + * along with this software; if not, see + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. + * + * Red Hat trademarks are not licensed under GPLv2. No permission is + * granted to use or replicate Red Hat trademarks that are incorporated + * in this software or its documentation. + */ + +package com.redhat.rhn.domain.cloudpayg; + +import com.redhat.rhn.common.hibernate.HibernateFactory; +import com.redhat.rhn.common.util.RpmVersionComparator; +import com.redhat.rhn.domain.channel.ChannelFamily; +import com.redhat.rhn.domain.channel.ChannelFamilyFactory; +import com.redhat.rhn.domain.common.ArchType; +import com.redhat.rhn.domain.credentials.Credentials; +import com.redhat.rhn.domain.product.SUSEProduct; +import com.redhat.rhn.domain.product.SUSEProductFactory; +import com.redhat.rhn.domain.rhnpackage.PackageFactory; +import com.redhat.rhn.domain.scc.SCCCachingFactory; +import com.redhat.rhn.domain.scc.SCCRepository; +import com.redhat.rhn.domain.scc.SCCRepositoryAuth; +import com.redhat.rhn.domain.scc.SCCRepositoryCloudRmtAuth; +import com.redhat.rhn.taskomatic.task.payg.beans.PaygProductInfo; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.Session; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class PaygProductFactory extends HibernateFactory { + + private static final Logger LOGGER = LogManager.getLogger(PaygProductFactory.class); + + private static final RpmVersionComparator RPM_VERSION_COMPARATOR = new RpmVersionComparator(); + + @Override + protected Logger getLogger() { + return LOGGER; + } + + /** + * Associates the given credentials to the specified products. All previous associated products will be removed. + * @param credentials the credentials + * @param productInfos a collection of products associated with the credentials + */ + public static void updateProducts(Credentials credentials, Collection productInfos) { + Session session = getSession(); + + // First delete all the existing products + session.createNamedQuery("PaygCredentialsProduct.deleteByCredentials") + .setParameter("creds", credentials) + .executeUpdate(); + + if (CollectionUtils.isEmpty(productInfos)) { + return; + } + + // Store the products + productInfos.stream() + .map(product -> new PaygCredentialsProduct(credentials, product)) + .forEach(session::save); + } + + /** + * Retrieves all the products associated with the given credentials + * @param credentials the credentials + * @return the list of products associated with the credentials or an empty list if none are set. + */ + public static List getProductsForCredentials(Credentials credentials) { + return getSession().createNamedQuery("PaygCredentialsProduct.listByCredentials", PaygCredentialsProduct.class) + .setParameter("creds", credentials) + .stream() + .map(p -> new PaygProductInfo(p.getName(), p.getVersion(), p.getArch())) + .collect(Collectors.toList()); + } + + /** + * Updates the repository authorization for the products associated with the specified credentials + * @param credentials the credentials + * @param products the products + * @return the list of authorization that have been processed + */ + public static List refreshRepositoriesAuths(Credentials credentials, + Collection products) { + List existingAuths = SCCCachingFactory.lookupRepositoryAuthByCredential(credentials); + + List processedAuths = new ArrayList<>(); + PaygProductFactory.getRepositoryForProducts(products).forEach(repository -> { + SCCRepositoryAuth authRepo = getOrCreateRepositoryAuth(existingAuths, repository); + + authRepo.setCredentials(credentials); + // Update content source URL, since it should be pointing to a Credentials record, and it may have changed + if (authRepo.getContentSource() != null) { + authRepo.getContentSource().setSourceUrl(authRepo.getUrl()); + } + + SCCCachingFactory.saveRepositoryAuth(authRepo); + processedAuths.add(authRepo); + }); + + existingAuths.stream() + .filter(er -> processedAuths.stream().noneMatch(pr -> er.getId().equals(pr.getId()))) + .forEach(SCCCachingFactory::deleteRepositoryAuth); + + return processedAuths; + } + + private static SCCRepositoryAuth getOrCreateRepositoryAuth(List auths, + SCCRepository repository) { + return auths.stream() + .filter(r -> r.getRepo().getId().equals(repository.getId())) + .findFirst() + .orElseGet(() -> { + SCCRepositoryCloudRmtAuth newAuth = new SCCRepositoryCloudRmtAuth(); + newAuth.setRepo(repository); + return newAuth; + }); + } + + /** + * Retrieves the repositories associated with the specified products + * @param products the list of products + * @return the set of repositories + */ + private static Stream getRepositoryForProducts(Collection products) { + return products.stream() + .map(product -> { + if (product.getName().equalsIgnoreCase("suse-manager-proxy")) { + return SCCCachingFactory.lookupRepositoriesByRootProductNameVersionArchForPayg( + product.getName(), product.getVersion(), product.getArch()); + } + + return SCCCachingFactory.lookupRepositoriesByProductNameAndArchForPayg( + product.getName(), product.getArch()) + .stream() + // We add Tools Channels directly to SLE12 products, but they are not accessible + // via the SLES credentials. We need to remove them from all except the sle-manager-tools + // product + .filter(r -> !(!product.getName().equalsIgnoreCase("sle-manager-tools") && + r.getName().toLowerCase(Locale.ROOT).startsWith("sle-manager-tools12"))) + .collect(Collectors.toSet()); + + }) + .flatMap(Set::stream); + } + + /** + * Lists the additional products that are accessible when SUSE Manager is PAYG. These are: + * 1) SUSE Manager Tools products with RPM architecture (DEB are not yet supported) + * 2) SUSE Manager proxy products with version >= 4.2 + * @return the list of additional products that are accessible when SUSE Manager is PAYG + */ + public static List listAdditionalProductsForSUMAPayg() { + return SUSEProductFactory.findAllSUSEProducts().stream() + .filter(p -> Objects.nonNull(p.getChannelFamily()) && Objects.nonNull(p.getArch())) + .filter(p -> isSupportedToolsProduct(p) || isSupportedProxyProduct(p)) + .map(p -> new PaygProductInfo(p.getName(), p.getVersion(), p.getArch().getLabel())) + .collect(Collectors.toList()); + } + + private static boolean isSupportedToolsProduct(SUSEProduct product) { + ChannelFamily family = product.getChannelFamily(); + ArchType architecture = product.getArch().getArchType(); + + return ChannelFamilyFactory.TOOLS_CHANNEL_FAMILY_LABEL.equals(family.getLabel()) && + // TODO: deb not yet available on RMT + PackageFactory.ARCH_TYPE_RPM.equals(architecture.getLabel()); + } + + private static boolean isSupportedProxyProduct(SUSEProduct product) { + ChannelFamily family = product.getChannelFamily(); + String version = product.getVersion(); + + return ChannelFamilyFactory.PROXY_CHANNEL_FAMILY_LABEL.equals(family.getLabel()) && + RPM_VERSION_COMPARATOR.compare(version, "4.2") >= 0; + } +} diff --git a/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshData.java b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshData.java index 581d53446639..80b11a19e620 100644 --- a/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshData.java +++ b/java/code/src/com/redhat/rhn/domain/cloudpayg/PaygSshData.java @@ -33,6 +33,7 @@ import javax.persistence.OneToOne; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import javax.persistence.Transient; @Entity @Table(name = "susePaygSshData") @@ -306,6 +307,15 @@ public void setRmtHosts(CloudRmtHost rmtHostsIn) { this.rmtHosts = rmtHostsIn; } + /** + * Identifies a connection for SUSE Manager PAYG + * @return true if this SSH data refers to a SUSE Manager PAYG connection. + */ + @Transient + public boolean isSUSEManagerPayg() { + return "localhost".equals(host); + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml index 6b5c1f8da6ee..95721e69333a 100644 --- a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.hbm.xml @@ -20,6 +20,12 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + + + + + + diff --git a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java index a5fc10ec20ab..ff87ad143dc7 100644 --- a/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java +++ b/java/code/src/com/redhat/rhn/domain/credentials/Credentials.java @@ -16,6 +16,7 @@ package com.redhat.rhn.domain.credentials; import com.redhat.rhn.domain.BaseDomainHelper; +import com.redhat.rhn.domain.cloudpayg.PaygCredentialsProduct; import com.redhat.rhn.domain.cloudpayg.PaygSshData; import com.redhat.rhn.domain.user.User; @@ -26,6 +27,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import java.util.Optional; +import java.util.Set; /** * Credentials - Java representation of the table SUSECREDENTIALS. @@ -52,6 +54,8 @@ public class Credentials extends BaseDomainHelper { private PaygSshData paygSshData; + private Set paygProducts; + /** * Get the ID of this object. * @return id @@ -188,6 +192,14 @@ public void setPaygSshData(PaygSshData paygSshDataIn) { this.paygSshData = paygSshDataIn; } + public Set getPaygProducts() { + return paygProducts; + } + + public void setPaygProducts(Set paygProductsIn) { + this.paygProducts = paygProductsIn; + } + /** * Credentials are considered as valid as soon as we have a user and a * password. diff --git a/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java b/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java index bbc49150ad86..a72f914d9af2 100644 --- a/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java +++ b/java/code/src/com/redhat/rhn/domain/product/SUSEProductFactory.java @@ -20,7 +20,6 @@ import com.redhat.rhn.common.util.RpmVersionComparator; import com.redhat.rhn.domain.channel.Channel; import com.redhat.rhn.domain.channel.ChannelFactory; -import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.rhnpackage.PackageArch; import com.redhat.rhn.domain.rhnpackage.PackageEvr; import com.redhat.rhn.domain.rhnpackage.PackageFactory; @@ -60,6 +59,8 @@ public class SUSEProductFactory extends HibernateFactory { private static Logger log = LogManager.getLogger(SUSEProductFactory.class); private static SUSEProductFactory singleton = new SUSEProductFactory(); + private static final RpmVersionComparator RPM_VERSION_COMPARATOR = new RpmVersionComparator(); + private SUSEProductFactory() { super(); } @@ -131,10 +132,9 @@ public static List lookupPSRByChannelLabel(String chan Session session = getSession(); Criteria c = session.createCriteria(SUSEProductSCCRepository.class); c.add(Restrictions.eq("channelLabel", channelLabel)); - RpmVersionComparator rpmVersionComparator = new RpmVersionComparator(); return ((List) c.list()).stream() .sorted((a, b) -> - rpmVersionComparator.compare(b.getProduct().getVersion(), a.getProduct().getVersion())) + RPM_VERSION_COMPARATOR.compare(b.getProduct().getVersion(), a.getProduct().getVersion())) .collect(Collectors.toList()); } @@ -231,11 +231,10 @@ public static List lookupByChannelName(String name) { * @return SUSEProductSCCRepository entry with the newest product */ public static Optional lookupByChannelLabelFirst(String channelLabel) { - RpmVersionComparator rpmVersionComparator = new RpmVersionComparator(); return lookupByChannelLabel(channelLabel) .stream() // sort so we always choose the latest version - .sorted((a, b) -> rpmVersionComparator.compare(b.getProduct().getVersion(), + .sorted((a, b) -> RPM_VERSION_COMPARATOR.compare(b.getProduct().getVersion(), a.getProduct().getVersion())) // We take the first item since there can be more than one entry. @@ -670,26 +669,6 @@ public static List findAllExtensionsOfRootProduct(SUSEProduct root) .list(); } - /** - * @return a stream of products with channel family SLE-M-T (Tools Channel) - */ - public static Stream listAllSLEMTProducts() { - //TODO: replace with optimised query later - return findAllSUSEProducts().stream() - .filter(p -> p.getChannelFamily() != null) - .filter(p -> ChannelFamilyFactory.TOOLS_CHANNEL_FAMILY_LABEL.equals(p.getChannelFamily().getLabel())); - } - - /** - * @return a stream of products with channel family SMP (SUSE Manager Proxy) - */ - public static Stream listAllSMPProducts() { - //TODO: replace with optimised query later - return findAllSUSEProducts().stream() - .filter(p -> p.getChannelFamily() != null) - .filter(p -> p.getChannelFamily().getLabel().equals(ChannelFamilyFactory.PROXY_CHANNEL_FAMILY_LABEL)); - } - /** * Find an {@link InstalledProduct} given by name, version, * release, arch and isBaseProduct flag. diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index 1b54dfa2d69e..c8179742752c 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -25,6 +25,7 @@ import com.redhat.rhn.domain.channel.ChannelFamilyFactory; import com.redhat.rhn.domain.channel.ContentSource; import com.redhat.rhn.domain.channel.PublicChannelFamily; +import com.redhat.rhn.domain.cloudpayg.PaygProductFactory; import com.redhat.rhn.domain.cloudpayg.PaygSshData; import com.redhat.rhn.domain.cloudpayg.PaygSshDataFactory; import com.redhat.rhn.domain.common.ManagerInfoFactory; @@ -54,6 +55,7 @@ import com.redhat.rhn.domain.server.MinionServer; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.manager.channel.ChannelManager; +import com.redhat.rhn.taskomatic.task.payg.beans.PaygProductInfo; import com.suse.cloud.CloudPaygManager; import com.suse.manager.webui.services.pillar.MinionGeneralPillarGenerator; @@ -599,6 +601,17 @@ private void refreshRepositoriesAuthentication(String mirrorUrl) throws ContentS throw new ContentSyncException(e); } } + else if (c.isTypeOf(Credentials.TYPE_CLOUD_RMT)) { + // Retrieve the products associated with this credentials + List productsList = PaygProductFactory.getProductsForCredentials(c); + // If it's SUMA PAYG, check if we synced additional products we can access + if (c.getPaygSshData().isSUSEManagerPayg()) { + productsList.addAll(PaygProductFactory.listAdditionalProductsForSUMAPayg()); + } + + List repoAuths = PaygProductFactory.refreshRepositoriesAuths(c, productsList); + LOG.info("Refreshed {} repository auths associated to the PAYG credentials", repoAuths.size()); + } repos.addAll(getAdditionalRepositories()); refreshRepositoriesAuthentication(repos, c, mirrorUrl); } diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java index 8c6f99b2d711..504e23db1242 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataExtractor.java @@ -16,12 +16,8 @@ package com.redhat.rhn.taskomatic.task.payg; import com.redhat.rhn.common.conf.Config; -import com.redhat.rhn.common.util.RpmVersionComparator; import com.redhat.rhn.domain.cloudpayg.PaygSshData; -import com.redhat.rhn.domain.product.SUSEProductFactory; -import com.redhat.rhn.domain.rhnpackage.PackageFactory; import com.redhat.rhn.taskomatic.task.payg.beans.PaygInstanceInfo; -import com.redhat.rhn.taskomatic.task.payg.beans.PaygProductInfo; import com.suse.manager.reactor.utils.OptionalTypeAdapterFactory; @@ -39,10 +35,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; public class PaygAuthDataExtractor { @@ -227,25 +219,11 @@ protected PaygInstanceInfo extractAuthDataLocal() { * @throws Exception */ public PaygInstanceInfo extractAuthData(PaygSshData instance) throws Exception { - if (instance.getHost().equals("localhost")) { - PaygInstanceInfo paygInstanceInfo = extractAuthDataLocal(); - RpmVersionComparator rpmVersionComparator = new RpmVersionComparator(); - List slemtProductInfos = Stream.concat( - SUSEProductFactory.listAllSLEMTProducts() - // TODO: deb not yet available on RMT - .filter(p -> p.getArch().getArchType().getLabel().equals(PackageFactory.ARCH_TYPE_RPM)), - SUSEProductFactory.listAllSMPProducts() - .filter(p -> rpmVersionComparator.compare(p.getVersion(), "4.2") >= 0)) - .filter(p -> Objects.nonNull(p.getArch())) - .map(p -> new PaygProductInfo(p.getName(), p.getVersion(), p.getArch().getLabel())) - .collect(Collectors.toList()); - paygInstanceInfo.getProducts().addAll(slemtProductInfos); - - return paygInstanceInfo; - } - else { - return extractAuthDataSSH(instance); + if (instance.isSUSEManagerPayg()) { + return extractAuthDataLocal(); } + + return extractAuthDataSSH(instance); } private StringBuilder getCommandOutput(InputStream channelStdout) throws IOException { diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java index 2b206f9a5682..17d7dad1fa2a 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/PaygAuthDataProcessor.java @@ -17,14 +17,12 @@ import com.redhat.rhn.domain.cloudpayg.CloudRmtHost; import com.redhat.rhn.domain.cloudpayg.CloudRmtHostFactory; +import com.redhat.rhn.domain.cloudpayg.PaygProductFactory; import com.redhat.rhn.domain.cloudpayg.PaygSshData; import com.redhat.rhn.domain.cloudpayg.PaygSshDataFactory; import com.redhat.rhn.domain.credentials.Credentials; import com.redhat.rhn.domain.credentials.CredentialsFactory; -import com.redhat.rhn.domain.scc.SCCCachingFactory; -import com.redhat.rhn.domain.scc.SCCRepository; import com.redhat.rhn.domain.scc.SCCRepositoryAuth; -import com.redhat.rhn.domain.scc.SCCRepositoryCloudRmtAuth; import com.redhat.rhn.taskomatic.task.payg.beans.PaygInstanceInfo; import com.redhat.rhn.taskomatic.task.payg.beans.PaygProductInfo; @@ -37,14 +35,11 @@ import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; public class PaygAuthDataProcessor { @@ -67,36 +62,23 @@ public void processPaygInstanceData(PaygSshData instance, PaygInstanceInfo paygD LOG.debug("Number installed Products: {}", paygData.getProducts().size()); Credentials credentials = processAndGetCredentials(instance, paygData); - List existingRepos = SCCCachingFactory.lookupRepositoryAuthByCredential(credentials); - - Set repositories = getReposToInsert(paygData.getProducts()); - - List processedRepoAuth = new ArrayList<>(); - repositories.forEach(sccRepo-> { - SCCRepositoryAuth authRepo = existingRepos.stream().filter(r -> r.getRepo().getId().equals(sccRepo.getId())) - .findFirst().orElseGet(() -> { - SCCRepositoryCloudRmtAuth newAuth = new SCCRepositoryCloudRmtAuth(); - newAuth.setRepo(sccRepo); - return newAuth; - }); - - authRepo.setCredentials(credentials); - // Update content source URL, since it should be pointing to a Credentials record, and it may have changed - if (authRepo.getContentSource() != null) { - authRepo.getContentSource().setSourceUrl(authRepo.getUrl()); - } - - SCCCachingFactory.saveRepositoryAuth(authRepo); - processedRepoAuth.add(authRepo); - }); - - LOG.debug("Total repository authentication inserted: {}", processedRepoAuth.size()); - existingRepos.stream() - .filter(er -> processedRepoAuth.stream().noneMatch(pr -> er.getId().equals(pr.getId()))) - .forEach(SCCCachingFactory::deleteRepositoryAuth); - processCloudRmtHost(instance, paygData); + // Update the PAYG products associated with the credentials + LOG.debug("Associating the installed products with the credentials # {}", credentials.getId()); + PaygProductFactory.updateProducts(credentials, paygData.getProducts()); + + // Add the Tools and Proxy products that are accessible when in SUMA Payg environment + List products = new LinkedList<>(paygData.getProducts()); + if (instance.isSUSEManagerPayg()) { + products.addAll(PaygProductFactory.listAdditionalProductsForSUMAPayg()); + } + + // Update the authorizations for accessing the product repositories + List repoAuths = PaygProductFactory.refreshRepositoriesAuths(credentials, products); + LOG.debug("Total repository authentication processed: {}", repoAuths.size()); + // Store the information about the Cloud RMT server + processCloudRmtHost(instance, paygData); } private void processCloudRmtHost(PaygSshData instance, PaygInstanceInfo paygData) { @@ -152,7 +134,6 @@ private Credentials processAndGetCredentials(PaygSshData instance, PaygInstanceI return credentials; } - /** * Invalidate PAYG Instance credentials * @param instance the instance @@ -167,26 +148,4 @@ public void invalidateCredentials(PaygSshData instance) { }); } - private Set getReposToInsert(List products) { - return products.stream() - .map(product -> { - if (product.getName().equalsIgnoreCase("suse-manager-proxy")) { - return SCCCachingFactory.lookupRepositoriesByRootProductNameVersionArchForPayg( - product.getName(), product.getVersion(), product.getArch()); - } - - return SCCCachingFactory.lookupRepositoriesByProductNameAndArchForPayg( - product.getName(), product.getArch()) - .stream() - // We add Tools Channels directly to SLE12 products, but they are not accessible - // via the SLES credentials. We need to remove them from all except the sle-manager-tools - // product - .filter(r -> !(!product.getName().equalsIgnoreCase("sle-manager-tools") && - r.getName().toLowerCase(Locale.ROOT).startsWith("sle-manager-tools12"))) - .collect(Collectors.toSet()); - - }) - .flatMap(Set::stream) - .collect(Collectors.toSet()); - } } diff --git a/schema/spacewalk/common/tables/susePaygProduct.sql b/schema/spacewalk/common/tables/susePaygProduct.sql new file mode 100644 index 000000000000..a0d6d9511812 --- /dev/null +++ b/schema/spacewalk/common/tables/susePaygProduct.sql @@ -0,0 +1,30 @@ +-- +-- Copyright (c) 2023 SUSE +-- +-- This software is licensed to you under the GNU General Public License, +-- version 2 (GPLv2). There is NO WARRANTY for this software, express or +-- implied, including the implied warranties of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 +-- along with this software; if not, see +-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. +-- + +CREATE TABLE susePaygProduct +( + id NUMERIC NOT NULL + CONSTRAINT susePaygProduct_pk PRIMARY KEY, + credentials_id NUMERIC NOT NULL + CONSTRAINT susePaygProduct_credentials_id_fk + REFERENCES suseCredentials (id) + ON DELETE CASCADE, + name VARCHAR(256), + version VARCHAR(256), + arch VARCHAR(256), + created TIMESTAMPTZ DEFAULT (current_timestamp) NOT NULL, + modified TIMESTAMPTZ DEFAULT (current_timestamp) NOT NULL +); + +CREATE SEQUENCE susePaygProduct_id_seq; + +CREATE UNIQUE INDEX susePaygProduct_credentials_product_uq + ON susePaygProduct (credentials_id, name, version, arch); diff --git a/schema/spacewalk/susemanager-schema.changes.mackdk.4.3-allow-sync-with-rmt b/schema/spacewalk/susemanager-schema.changes.mackdk.4.3-allow-sync-with-rmt new file mode 100644 index 000000000000..733745b8dad9 --- /dev/null +++ b/schema/spacewalk/susemanager-schema.changes.mackdk.4.3-allow-sync-with-rmt @@ -0,0 +1 @@ +- Store the PAYG products diff --git a/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/202-payg-products.sql b/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/202-payg-products.sql new file mode 100644 index 000000000000..5777e8224377 --- /dev/null +++ b/schema/spacewalk/upgrade/susemanager-schema-4.4.6-to-susemanager-schema-4.4.7/202-payg-products.sql @@ -0,0 +1,19 @@ +CREATE TABLE IF NOT EXISTS susePaygProduct +( + id NUMERIC NOT NULL + CONSTRAINT susePaygProduct_pk PRIMARY KEY, + credentials_id NUMERIC NOT NULL + CONSTRAINT susePaygProduct_credentials_id_fk + REFERENCES suseCredentials (id) + ON DELETE CASCADE, + name VARCHAR(256), + version VARCHAR(256), + arch VARCHAR(256), + created TIMESTAMPTZ DEFAULT (current_timestamp) NOT NULL, + modified TIMESTAMPTZ DEFAULT (current_timestamp) NOT NULL +); + +CREATE SEQUENCE IF NOT EXISTS susePaygProduct_id_seq; + +CREATE UNIQUE INDEX IF NOT EXISTS susePaygProduct_credentials_product_uq + ON susePaygProduct (credentials_id, name, version, arch); From ead67142a0ae6fe9a3ada8205718b6a3e4efcdbe Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Tue, 25 Jul 2023 16:43:50 +0200 Subject: [PATCH 100/127] Make sure the messages are up-to-date after syncing the products --- .../webui/controllers/ProductsController.java | 38 +++++++++++++------ ...ava.changes.mackdk.4.3-allow-sync-with-rmt | 1 + .../manager/admin/setup/products/products.tsx | 35 +++++++++++++---- ...web.changes.mackdk.4.3-allow-sync-with-rmt | 1 + 4 files changed, 56 insertions(+), 19 deletions(-) create mode 100644 web/spacewalk-web.changes.mackdk.4.3-allow-sync-with-rmt diff --git a/java/code/src/com/suse/manager/webui/controllers/ProductsController.java b/java/code/src/com/suse/manager/webui/controllers/ProductsController.java index 727f3e4a8568..9debbfc37e73 100644 --- a/java/code/src/com/suse/manager/webui/controllers/ProductsController.java +++ b/java/code/src/com/suse/manager/webui/controllers/ProductsController.java @@ -98,6 +98,7 @@ public static void initRoutes(JadeTemplateEngine jade) { get("/manager/admin/setup/products", withUserPreferences(withCsrfToken(withOrgAdmin(ProductsController::show))), jade); get("/manager/api/admin/products", withUser(ProductsController::data)); + get("/manager/api/admin/products/metadata", withUser(ProductsController::getMetadata)); post("/manager/api/admin/mandatoryChannels", withUser(ProductsController::getMandatoryChannels)); post("/manager/admin/setup/products", withProductAdmin(ProductsController::addProduct)); @@ -122,19 +123,34 @@ public static void initRoutes(JadeTemplateEngine jade) { * @return the ModelAndView object to render the page */ public static ModelAndView show(Request request, Response response, User user) { - TaskoRun latestRun = TaskoFactory.getLatestRun("mgr-sync-refresh-bunch"); + return new ModelAndView(getMetadataMap(), "templates/products/show.jade"); + } - Map data = new HashMap<>(); + /** + * Retrieves the metadata of the products page + * + * @param request the request + * @param response the response + * @param user the user + * @return a JSON object containing the metadata + */ + public static String getMetadata(Request request, Response response, User user) { + return json(response, getMetadataMap()); + } + + private static Map getMetadataMap() { + TaskoRun latestRun = TaskoFactory.getLatestRun("mgr-sync-refresh-bunch"); ContentSyncManager csm = new ContentSyncManager(); - data.put(ISS_MASTER, String.valueOf(IssFactory.getCurrentMaster() == null)); - data.put(REFRESH_NEEDED, String.valueOf(csm.isRefreshNeeded(null))); - data.put(REFRESH_RUNNING, String.valueOf(latestRun != null && latestRun.getEndTime() == null)); - data.put(REFRESH_FILE_LOCKED, String.valueOf(FileLocks.SCC_REFRESH_LOCK.isLocked())); - data.put(NO_TOOLS_CHANNEL_SUBSCRIPTION, - String.valueOf(!(ConfigDefaults.get().isUyuni() || - csm.hasToolsChannelSubscription() || csm.canSyncToolsChannelViaCloudRMT()))); - - return new ModelAndView(data, "templates/products/show.jade"); + + Map metadataMap = new HashMap<>(); + metadataMap.put(ISS_MASTER, IssFactory.getCurrentMaster() == null); + metadataMap.put(REFRESH_NEEDED, csm.isRefreshNeeded(null)); + metadataMap.put(REFRESH_RUNNING, latestRun != null && latestRun.getEndTime() == null); + metadataMap.put(REFRESH_FILE_LOCKED, FileLocks.SCC_REFRESH_LOCK.isLocked()); + metadataMap.put(NO_TOOLS_CHANNEL_SUBSCRIPTION, !(ConfigDefaults.get().isUyuni() || + csm.hasToolsChannelSubscription() || csm.canSyncToolsChannelViaCloudRMT())); + + return metadataMap; } /** diff --git a/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt b/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt index 69abae38310c..cee493850aaa 100644 --- a/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt +++ b/java/spacewalk-java.changes.mackdk.4.3-allow-sync-with-rmt @@ -1 +1,2 @@ +- Introduced new API to update the products page metadata - Extracted additional authentication information needed for PAYG diff --git a/web/html/src/manager/admin/setup/products/products.tsx b/web/html/src/manager/admin/setup/products/products.tsx index 5011545a1a6d..abfc31cad19e 100644 --- a/web/html/src/manager/admin/setup/products/products.tsx +++ b/web/html/src/manager/admin/setup/products/products.tsx @@ -99,6 +99,10 @@ const _COLS = { mix: { width: 13, um: "em" }, }; +function loadMetadata() { + return Network.get("/rhn/manager/api/admin/products/metadata"); +} + function reloadData() { return Network.get("/rhn/manager/api/admin/products"); } @@ -140,18 +144,33 @@ class ProductsPageWrapper extends React.Component { refreshServerData = () => { this.setState({ loading: true }); - var currentObject = this; - let resultMessages: MessageType[] = currentObject.state.errors; - if (currentObject.state.noToolsChannelSubscription && currentObject.state.issMaster) { - resultMessages = MessagesUtils.warning( - t("No SUSE Manager Server Subscription available. Products requiring Client Tools Channel will not be shown.") - ); - } + const currentObject = this; + + loadMetadata() + .then((metadata) => { + currentObject.setState({ + issMaster: metadata.issMaster, + refreshNeeded: metadata.refreshNeeded, + refreshRunning: metadata.refreshRunning || metadata.refreshFileLocked, + noToolsChannelSubscription: metadata.noToolsChannelSubscription, + }); + + if (currentObject.state.noToolsChannelSubscription && currentObject.state.issMaster) { + currentObject.setState({ + errors: MessagesUtils.warning( + t( + "No SUSE Manager Server Subscription available. Products requiring Client Tools Channel will not be shown." + ) + ), + }); + } + }) + .catch(this.handleResponseError); + reloadData() .then((data) => { currentObject.setState({ serverData: data[_DATA_ROOT_ID], - errors: resultMessages, loading: false, selectedItems: [], scheduleResyncItems: [], diff --git a/web/spacewalk-web.changes.mackdk.4.3-allow-sync-with-rmt b/web/spacewalk-web.changes.mackdk.4.3-allow-sync-with-rmt new file mode 100644 index 000000000000..383898ccaedb --- /dev/null +++ b/web/spacewalk-web.changes.mackdk.4.3-allow-sync-with-rmt @@ -0,0 +1 @@ +- Update the messages after syncing the products From f91936cb5a00989be6defd1521ba4c7a862df84b Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Fri, 7 Jul 2023 15:32:33 +0200 Subject: [PATCH 101/127] Integrate instance-flavor-check to detect if the instance is PAYG --- .../src/com/suse/cloud/CloudPaygManager.java | 58 ++++++++++++++----- .../suse/cloud/test/CloudPaygManagerTest.java | 6 +- ...va.changes.mackdk.4.3-integrate-payg-check | 1 + spacewalk/admin/spacewalk-startup-helper | 8 ++- 4 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 java/spacewalk-java.changes.mackdk.4.3-integrate-payg-check diff --git a/java/code/src/com/suse/cloud/CloudPaygManager.java b/java/code/src/com/suse/cloud/CloudPaygManager.java index 448976ae0730..302d2460bf3a 100644 --- a/java/code/src/com/suse/cloud/CloudPaygManager.java +++ b/java/code/src/com/suse/cloud/CloudPaygManager.java @@ -14,15 +14,23 @@ */ package com.suse.cloud; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.util.concurrent.ExecutionException; /** * Public Cloud Pay-as-you-go management class */ public class CloudPaygManager { + private static final Logger LOG = LogManager.getLogger(CloudPaygManager.class); - private boolean isPaygInstance = false; + private boolean isPaygInstance; private CloudProvider cloudProvider; public enum CloudProvider { NONE, @@ -44,7 +52,8 @@ else if (isFileExecutable("/usr/bin/azuremetadata")) { else if (isFileExecutable("/usr/bin/gcemetadata")) { cloudProvider = CloudProvider.GCE; } - detectPaygInstance(); + + isPaygInstance = detectPaygInstance(); } /** @@ -77,12 +86,17 @@ public void setPaygInstance(boolean isPaygInstanceIn) { isPaygInstance = isPaygInstanceIn; } - private void detectPaygInstance() { - isPaygInstance = false; - //TODO: replace with a real check. registercloudguest is available on all images - if (isFileExecutable("/usr/sbin/registercloudguest") && - fileExists("/usr/share/susemanager/.ispayg")) { - isPaygInstance = true; + private boolean detectPaygInstance() { + if (!isFileExecutable("/usr/bin/instance-flavor-check")) { + return false; + } + + try { + return "PAYG".equals(getInstanceType()); + } + catch (ExecutionException ex) { + LOG.error("Unable to identify the instance type. Fallback to BYOS.", ex); + return false; } } @@ -96,11 +110,29 @@ protected boolean isFileExecutable(String filename) { } /** - * Check if files exists - * @param filename a filename to check - * @return returns true when file exists, otherwise false + * Executes the script to check the instance type and returns it. + * @return PAYG or BYOS depending on the instance type. + * @throws ExecutionException when the script is not successfully executed */ - protected boolean fileExists(String filename) { - return Files.exists(Path.of(filename)); + protected String getInstanceType() throws ExecutionException { + try { + Process proc = Runtime.getRuntime().exec("/usr/bin/instance-flavor-check"); + proc.waitFor(); + + try (InputStream inputStream = proc.getInputStream()) { + String type = StringUtils.trim(new String(inputStream.readAllBytes(), StandardCharsets.UTF_8)); + LOG.debug("Script execution returned {} with exit code {}", type, proc.exitValue()); + return type; + } + } + catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + + throw new ExecutionException("Interrupted while checking the instance type", ex); + } + catch (Exception ex) { + throw new ExecutionException("Unexpected Error while checking the instance type", ex); + } } + } diff --git a/java/code/src/com/suse/cloud/test/CloudPaygManagerTest.java b/java/code/src/com/suse/cloud/test/CloudPaygManagerTest.java index 44af3de79258..d7cd4f2512ad 100644 --- a/java/code/src/com/suse/cloud/test/CloudPaygManagerTest.java +++ b/java/code/src/com/suse/cloud/test/CloudPaygManagerTest.java @@ -61,13 +61,13 @@ public void testIsPayg() { CloudPaygManager cpm = new CloudPaygManager() { @Override protected boolean isFileExecutable(String filename) { - return filename.equals("/usr/sbin/registercloudguest") || + return filename.equals("/usr/bin/instance-flavor-check") || filename.equals("/usr/bin/ec2metadata"); } @Override - protected boolean fileExists(String filename) { - return filename.equals("/usr/share/susemanager/.ispayg"); + protected String getInstanceType() { + return "PAYG"; } }; assertTrue(cpm.isPaygInstance(), "Expecting a PAYG instance"); diff --git a/java/spacewalk-java.changes.mackdk.4.3-integrate-payg-check b/java/spacewalk-java.changes.mackdk.4.3-integrate-payg-check new file mode 100644 index 000000000000..77bf9da21353 --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.4.3-integrate-payg-check @@ -0,0 +1 @@ +- Integrate instance-flavor-check to detect if the instance is PAYG diff --git a/spacewalk/admin/spacewalk-startup-helper b/spacewalk/admin/spacewalk-startup-helper index 23fd0bb79c37..71116e94e436 100755 --- a/spacewalk/admin/spacewalk-startup-helper +++ b/spacewalk/admin/spacewalk-startup-helper @@ -27,8 +27,12 @@ perform_report_db_schema_upgrade() { } isPayg() { - # todo: improve this once the real check is available - test -f "/usr/share/susemanager/.ispayg" + if [ ! -x /usr/bin/instance-flavor-check ]; then + return 1 + fi + + TYPE=$(/usr/bin/instance-flavor-check) + [ "$TYPE" == "PAYG" ] } check_billing_service() { From e155817c1e8bcc37ca49a818ce1c0db720a29ed6 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 19 Jul 2023 18:15:50 +0200 Subject: [PATCH 102/127] Integrate check in python code --- .../task/payg/script/payg_extract_repo_data.py | 13 ++++++++++++- .../susemanager-sls/src/grains/public_cloud.py | 15 ++++++++++++++- ...er-sls.changes.mackdk.4.3-integrate-payg-check | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 susemanager-utils/susemanager-sls/susemanager-sls.changes.mackdk.4.3-integrate-payg-check diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py b/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py index be5a94489ecf..bd8a73e91cfc 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py +++ b/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py @@ -44,7 +44,17 @@ def system_exit(code, messages=None): def is_payg_instance(): - return os.path.isfile('/usr/sbin/registercloudguest') + flavor_check = "/usr/bin/instance-flavor-check" + if not os.path.isfile(flavor_check) or not os.access(flavor_check, os.X_OK): + return False + + try: + result = subprocess.run(flavor_check, check=False, stdout=subprocess.PIPE, universal_newlines=True).stdout.strip() + except subprocess.CalledProcessError: + return False + + return result == "PAYG" + SuseCloudInfo = namedtuple('SuseCloudInfo', ['header_auth', 'hostname']) @@ -82,6 +92,7 @@ def _get_instance_identification(): ] + def _extract_http_auth(credentials): credentials_file = '/etc/zypp/credentials.d/' + credentials if not Path(credentials_file).exists(): diff --git a/susemanager-utils/susemanager-sls/src/grains/public_cloud.py b/susemanager-utils/susemanager-sls/src/grains/public_cloud.py index ecc23a92d6d4..05e7a6ac208a 100644 --- a/susemanager-utils/susemanager-sls/src/grains/public_cloud.py +++ b/susemanager-utils/susemanager-sls/src/grains/public_cloud.py @@ -25,6 +25,7 @@ # Import python libs import os import socket +import subprocess from multiprocessing.pool import ThreadPool import logging @@ -141,8 +142,20 @@ def instance_id(): log.error("Skipping") return ret + def is_payg_instance(): ret = {} - if os.path.isfile('/usr/sbin/registercloudguest'): + flavor_check = "/usr/bin/instance-flavor-check" + if not os.path.isfile(flavor_check) or not os.access(flavor_check, os.X_OK): + return ret + + try: + result = subprocess.run(flavor_check, check=False, stdout=subprocess.PIPE, universal_newlines=True).stdout.strip() + except subprocess.CalledProcessError: + return ret + + if result == "PAYG": ret['is_payg_instance'] = True + return ret + diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes.mackdk.4.3-integrate-payg-check b/susemanager-utils/susemanager-sls/susemanager-sls.changes.mackdk.4.3-integrate-payg-check new file mode 100644 index 000000000000..77bf9da21353 --- /dev/null +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes.mackdk.4.3-integrate-payg-check @@ -0,0 +1 @@ +- Integrate instance-flavor-check to detect if the instance is PAYG From 8ac98ce014f19bab13b3fe970a92f251e045d88a Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Thu, 3 Aug 2023 15:16:13 +0200 Subject: [PATCH 103/127] add required dependencies to package and service --- ....changes.mc.Manager-4.3-suma-payg-add-debs-to-billing-service | 1 + python/billingdataservice/billing-data-service.service | 1 + python/billingdataservice/billing-data-service.spec | 1 + 3 files changed, 3 insertions(+) create mode 100644 python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-add-debs-to-billing-service diff --git a/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-add-debs-to-billing-service b/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-add-debs-to-billing-service new file mode 100644 index 000000000000..ca8eb167314d --- /dev/null +++ b/python/billingdataservice/billing-data-service.changes.mc.Manager-4.3-suma-payg-add-debs-to-billing-service @@ -0,0 +1 @@ +- add required dependencies to package and service diff --git a/python/billingdataservice/billing-data-service.service b/python/billingdataservice/billing-data-service.service index 750d177068a2..f438cd6244a1 100644 --- a/python/billingdataservice/billing-data-service.service +++ b/python/billingdataservice/billing-data-service.service @@ -2,6 +2,7 @@ Description=SUSE Manager PAYG billing data service After=local-fs.target network.target postgresql.service Before=tomcat.service taskomatic.service +Wants=postgresql.service [Service] Type=simple diff --git a/python/billingdataservice/billing-data-service.spec b/python/billingdataservice/billing-data-service.spec index cb53b3a49f6e..c9b5c2e23b0c 100644 --- a/python/billingdataservice/billing-data-service.spec +++ b/python/billingdataservice/billing-data-service.spec @@ -28,6 +28,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: apache2 Requires: python3-Flask +Requires: spacewalk-backend-sql Requires: spacewalk-taskomatic Requires: tomcat From e25f316d67ccd9e049254209ffe9c77307af2218 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Wed, 2 Aug 2023 13:30:06 +0200 Subject: [PATCH 104/127] forbid migration in PAYG only when we change the product family --- .../action/systems/SPMigrationAction.java | 10 ++++-- .../strings/java/StringResource_en_US.xml | 2 +- .../frontend/xmlrpc/system/SystemHandler.java | 10 +++--- .../distupgrade/DistUpgradeManager.java | 31 ++++++++++++++----- .../test/DistUpgradeManagerTest.java | 2 +- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java index af219293d95c..56d18b4df991 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SPMigrationAction.java @@ -317,7 +317,9 @@ else if (forward.getName().equals(SCHEDULE)) { // Setup list of channels to subscribe to List channelIDs = new ArrayList<>(); - channelIDs.addAll(Arrays.asList(targetChildChannels)); + if (targetChildChannels != null) { + channelIDs.addAll(Arrays.asList(targetChildChannels)); + } channelIDs.add(targetBaseChannel); // Schedule the dist upgrade action @@ -354,6 +356,8 @@ else if (forward.getName().equals(SCHEDULE)) { request.setAttribute(TARGET_PRODUCTS, migrationTargets); ActionErrors errors = new ActionErrors(); + // We do not support migration with individual channels in UI. So we only + // need 1 error message as the second case can only happens in API getStrutsDelegate().addError(errors, MSG_ERROR_PAYG_MIGRATION); getStrutsDelegate().saveMessages(request, errors); @@ -519,7 +523,9 @@ private List getChannelDTOs(RequestContext ctx, */ private SUSEProductSet createProductSet(Long baseProduct, Long[] addonProducts) { List addonProductsList = new ArrayList<>(); - addonProductsList.addAll(Arrays.asList(addonProducts)); + if (addonProducts != null) { + addonProductsList.addAll(Arrays.asList(addonProducts)); + } return new SUSEProductSet(baseProduct, addonProductsList); } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index c4fb5466c341..5a0d9341104b 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -8725,7 +8725,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte This system is scheduled for a dry run of the migration to <strong>{2}</strong>. Once the action completed successfully you can schedule the full migration <a href="/rhn/systems/details/history/Event.do?sid={0}&aid={1}">here</a> - Product migrations in Pay-as-you-go instances is forbidden. + PAY-AS-YOU-GO ALERT: Cross product migration attempt detected. Please note, migration from openSUSE to SLES or similar is not permitted under your current pay-as-you-go plan. Operation has been aborted. Run mgr-register diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java index b481f1da4296..31a0442f46a8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java @@ -7875,9 +7875,8 @@ public Long scheduleProductMigration(User loggedInUser, Integer sid, String targ throw new TaskomaticApiException(e.getMessage()); } catch (DistUpgradePaygException e) { - // We are not allowing product migration in SUMA PAYG instance - throw new FaultException(-1, "productMigrationNotAllowedPayg", - "Product migration in SUSE Manager PAYG is not allowed"); + // We forbid product migration in SUMA PAYG instance in certain situations + throw new FaultException(-1, "productMigrationNotAllowedPayg", e.getMessage()); } } @@ -7968,9 +7967,8 @@ public Long scheduleDistUpgrade(User loggedInUser, Integer sid, List cha earliestOccurrence, cloudPaygManager.isPaygInstance()); } catch (DistUpgradePaygException e) { - // We are not allowing product migration in SUMA PAYG instance - throw new FaultException(-1, "productMigrationNotAllowedPayg", - "Product migration in SUSE Manager PAYG is not allowed"); + // We forbid product migration in SUMA PAYG instance in certain situations + throw new FaultException(-1, "productMigrationNotAllowedPayg", e.getMessage()); } catch (DistUpgradeException e) { throw new FaultException(-1, "distUpgradeChannelError", e.getMessage()); diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java index a3c0dce64883..fca9a8683868 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/DistUpgradeManager.java @@ -606,6 +606,7 @@ public static Set performChannelChecks(List channelLabels, User us /** * Schedule a distribution upgrade for a given server. + * (private as it does not take PAYG into account) * * @param user the user who is scheduling * @param server the server to migrate @@ -618,7 +619,7 @@ public static Set performChannelChecks(List channelLabels, User us * @throws TaskomaticApiException if there was a Taskomatic error * (typically: Taskomatic is down) */ - public static Long scheduleDistUpgrade(User user, Server server, + private static Long scheduleDistUpgrade(User user, Server server, SUSEProductSet targetSet, Collection channelIDs, boolean dryRun, boolean allowVendorChange, Date earliest) throws TaskomaticApiException { // Create action details @@ -704,13 +705,29 @@ public static Long scheduleDistUpgrade(User user, Server server, if (isPayg) { /* - In the future we probably would like to allow product migrations to same product but different - version and just forbid migrating from different products. At the moment we are just blocking - all product migrations on SUMA PAYG instance. - I.e: Allow migration from SLES 15 SP4 to SLES 15 SP5. - Forbid migration from OpenSUSE Leap 15.4 to SLES 15 SP4 + Changing product family I.e + - SLES 15 SP5 to SLES for SAP 15 SP4 or + - from OpenSUSE Leap 15.4 to SLES 15 SP4 + is not allowed. + Only SP migrations should be possible. + Also individual assigning channels to perform a migration is forbidden */ - throw new DistUpgradePaygException("In PAYG SUMA instances, products migrations is forbidden"); + SUSEProduct installedBaseProduct = server.getInstalledProductSet() + .map(SUSEProductSet::getBaseProduct) + .orElseThrow(() -> + new FaultException(-1, "listMigrationTargetError", "Server has no Products installed.")); + if (targetSet != null) { + SUSEProduct targetBaseProduct = targetSet.getBaseProduct(); + if (targetBaseProduct.getChannelFamily() == null || + installedBaseProduct.getChannelFamily() == null || + !targetBaseProduct.getChannelFamily().equals(installedBaseProduct.getChannelFamily())) { + throw new DistUpgradePaygException( + "In PAYG SUMA instances, changing the product family is forbidden"); + } + } + else { + throw new DistUpgradePaygException("In PAYG SUMA instances, individual migrations are forbidden"); + } } return scheduleDistUpgrade(user, server, targetSet, channelIDs, dryRun, allowVendorChange, earliest); diff --git a/java/code/src/com/redhat/rhn/manager/distupgrade/test/DistUpgradeManagerTest.java b/java/code/src/com/redhat/rhn/manager/distupgrade/test/DistUpgradeManagerTest.java index 86cc5a1dd9b2..6806aad4e149 100644 --- a/java/code/src/com/redhat/rhn/manager/distupgrade/test/DistUpgradeManagerTest.java +++ b/java/code/src/com/redhat/rhn/manager/distupgrade/test/DistUpgradeManagerTest.java @@ -660,7 +660,7 @@ public void testScheduleDistUpgrade() throws Exception { channelIDs.add(channel2.getId()); Date scheduleDate = new Date(); Long actionID = DistUpgradeManager.scheduleDistUpgrade( - user, server, targetSet, channelIDs, true, false, scheduleDate); + user, server, targetSet, channelIDs, true, false, scheduleDate, false); // Get the scheduled action and check the contents DistUpgradeAction action = (DistUpgradeAction) ActionFactory.lookupById(actionID); assertEquals(ActionFactory.TYPE_DIST_UPGRADE, action.getActionType()); From e30c112d8d621e5819d27fe060ead9685626dd30 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Thu, 3 Aug 2023 10:42:34 +0200 Subject: [PATCH 105/127] Detect if minion is in the cloud Signed-off-by: Miguel Sama --- .../RegisterMinionEventMessageAction.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/java/code/src/com/suse/manager/reactor/messaging/RegisterMinionEventMessageAction.java b/java/code/src/com/suse/manager/reactor/messaging/RegisterMinionEventMessageAction.java index 9f1b8ac14da2..12462667049c 100644 --- a/java/code/src/com/suse/manager/reactor/messaging/RegisterMinionEventMessageAction.java +++ b/java/code/src/com/suse/manager/reactor/messaging/RegisterMinionEventMessageAction.java @@ -444,13 +444,28 @@ public void finalizeMinionRegistration(String minionId, if (cloudPaygManager.isPaygInstance() && CredentialsFactory.listSCCCredentials().size() == 0 && !RegistrationUtils.isAllowedOnPayg(systemQuery, minionId, Collections.emptySet(), grains)) { - // BYOS or DC Instance is not allowed to register on a pure SUMA PAYG - // exception: free products or SUSE Manager Proxy - throw new RegisterMinionException(minionId, org, String.format( - "Registration of '%s' on SUSE Manager Server rejected. \n" + - "To manage BYOS (Bring-your-own-Subscription) or Datacenter clients you have to configure " + - "SCC Credentials at Admin => Setup Wizard => Organization Credentials.", minionId)); + + // If the minion is not in the cloud + if (grains.getValueAsString("instance_id").length() == 0) { + // DC instances are not allowed to be onboarded without SCC credentials + throw new RegisterMinionException(minionId, org, String.format( + "Registration of '%s' on SUSE Manager Server rejected. \n" + + "To manage Datacenter clients you have to configure " + + "SCC Credentials at Admin => Setup Wizard => Organization Credentials.", minionId)); + } + else { + // BYOS in cloud instances is not allowed to register on a pure SUMA PAYG + // exception: free products or SUSE Manager Proxy + // Attention: minion could be PAYG, so it might lack of package `instance-flavor-check` + throw new RegisterMinionException(minionId, org, String.format( + "Registration of '%s' on SUSE Manager Server rejected. \n" + + "To manage BYOS (Bring-your-own-Subscription) clients you have to configure " + + "SCC Credentials at Admin => Setup Wizard => Organization Credentials. \n\n" + + "If the instance that is being trying to be onboarded is actually a Pay-As-You-Go " + + "one, please make sure package `instance-flavor-check` is installed and retry.", minionId)); + } } + MinionServer minion = migrateOrCreateSystem(minionId, isSaltSSH, activationKeyOverride, machineId, grains); minion.setMachineId(machineId); From e603226ecf33cf52b0fa18ce1f747aa6c5baa27a Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 10:43:11 +0200 Subject: [PATCH 106/127] change bootstrap message --- web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx b/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx index 9b2066222a48..d86d7782aff5 100644 --- a/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx +++ b/web/html/src/manager/systems/bootstrap/bootstrap-minions.tsx @@ -332,7 +332,7 @@ class BootstrapMinions extends React.Component { alertMessages = MessagesUtils.success(

    {t( - "Successfully bootstrapped host! Your system should appear in systems shortly. If it is a transactional system, please reboot it to finish registration.", + "Bootstrap process initiated. Your system should be visible at the following location shortly: systems. If any issues arise, you'll receive an error notification. In case you're working with a transactional system, please perform a system reboot to complete the registration process.", { link: (str) => ( From c2affe347d39d437632bc3752f86e5c8144273fc Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 12:01:00 +0200 Subject: [PATCH 107/127] simple HTML formated notification details --- .../redhat/rhn/domain/notification/types/ChannelSyncFailed.java | 2 +- .../domain/notification/types/CreateBootstrapRepoFailed.java | 2 +- .../redhat/rhn/domain/notification/types/OnboardingFailed.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/code/src/com/redhat/rhn/domain/notification/types/ChannelSyncFailed.java b/java/code/src/com/redhat/rhn/domain/notification/types/ChannelSyncFailed.java index 3868658fa139..1acad9e53c72 100644 --- a/java/code/src/com/redhat/rhn/domain/notification/types/ChannelSyncFailed.java +++ b/java/code/src/com/redhat/rhn/domain/notification/types/ChannelSyncFailed.java @@ -84,6 +84,6 @@ public String getSummary() { */ @Override public String getDetails() { - return details; + return String.format("

    %s
    ", details); } } diff --git a/java/code/src/com/redhat/rhn/domain/notification/types/CreateBootstrapRepoFailed.java b/java/code/src/com/redhat/rhn/domain/notification/types/CreateBootstrapRepoFailed.java index b376072ea71c..fe7d2648d6ed 100644 --- a/java/code/src/com/redhat/rhn/domain/notification/types/CreateBootstrapRepoFailed.java +++ b/java/code/src/com/redhat/rhn/domain/notification/types/CreateBootstrapRepoFailed.java @@ -74,6 +74,6 @@ public String getSummary() { */ @Override public String getDetails() { - return details; + return String.format("
    %s
    ", details); } } diff --git a/java/code/src/com/redhat/rhn/domain/notification/types/OnboardingFailed.java b/java/code/src/com/redhat/rhn/domain/notification/types/OnboardingFailed.java index 863a8b718e97..4121e1bd5b59 100644 --- a/java/code/src/com/redhat/rhn/domain/notification/types/OnboardingFailed.java +++ b/java/code/src/com/redhat/rhn/domain/notification/types/OnboardingFailed.java @@ -82,6 +82,6 @@ public String getSummary() { */ @Override public String getDetails() { - return details; + return String.format("
    %s
    ", details); } } From d3e01fc5b0b1fad6cd6954be678559a98c0d177a Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 12:23:53 +0200 Subject: [PATCH 108/127] adapt testcases to new error messages --- .../test/RegisterMinionActionTest.java | 50 +++- .../reactor/test/dummy_systeminfo_byos.json | 280 ++++++++++++++++++ 2 files changed, 328 insertions(+), 2 deletions(-) create mode 100644 java/code/src/com/suse/manager/reactor/test/dummy_systeminfo_byos.json diff --git a/java/code/src/com/suse/manager/reactor/test/RegisterMinionActionTest.java b/java/code/src/com/suse/manager/reactor/test/RegisterMinionActionTest.java index 1e5566464995..1fba0dc8bd53 100644 --- a/java/code/src/com/suse/manager/reactor/test/RegisterMinionActionTest.java +++ b/java/code/src/com/suse/manager/reactor/test/RegisterMinionActionTest.java @@ -1817,7 +1817,7 @@ public boolean isPaygInstance() { executeTest( (key) -> new Expectations() {{ allowing(saltServiceMock).getSystemInfoFull(MINION_ID); - will(returnValue(getSystemInfo(MINION_ID, null, key))); + will(returnValue(getSystemInfo(MINION_ID, "byos", key))); List pil = new ArrayList<>(); ProductInfo pi = new ProductInfo( product.getName(), @@ -1835,7 +1835,7 @@ public boolean isPaygInstance() { } catch (RegisterMinionEventMessageAction.RegisterMinionException e) { assertContains(e.getMessage(), MINION_ID); - assertContains(e.getMessage(), "To manage BYOS (Bring-your-own-Subscription) or Datacenter clients " + + assertContains(e.getMessage(), "To manage BYOS (Bring-your-own-Subscription) clients " + "you have to configure SCC Credentials"); return; } @@ -1845,6 +1845,52 @@ public boolean isPaygInstance() { fail("Expected Exception not thrown"); } + /** + * Test a registration of a non-free DC client at a PAYG SUMA Server. + * @throws Exception + */ + @Test + public void testRegisterMinionDConPAYG() throws Exception { + cloudManager4Test = new CloudPaygManager() { + @Override + public boolean isPaygInstance() { + return true; + } + }; + ChannelFamily channelFamily = createTestChannelFamily(); + SUSEProduct product = SUSEProductTestUtils.createTestSUSEProduct(channelFamily); + product.setFree(false); + try { + executeTest( + (key) -> new Expectations() {{ + allowing(saltServiceMock).getSystemInfoFull(MINION_ID); + will(returnValue(getSystemInfo(MINION_ID, null, key))); + List pil = new ArrayList<>(); + ProductInfo pi = new ProductInfo( + product.getName(), + product.getArch().getLabel(), "descr", "eol", "epoch", "flavor", + true, true, "productline", Optional.of("registerrelease"), + "test", "repo", "shortname", "summary", "vendor", + product.getVersion()); + pil.add(pi); + allowing(saltServiceMock).getProducts(with(any(String.class))); + will(returnValue(Optional.of(pil))); + }}, + ACTIVATION_KEY_SUPPLIER, + (optMinion, machineId, key) -> assertTrue(optMinion.isEmpty()), + DEFAULT_CONTACT_METHOD); + } + catch (RegisterMinionEventMessageAction.RegisterMinionException e) { + assertContains(e.getMessage(), MINION_ID); + assertContains(e.getMessage(), "To manage Datacenter clients you have to configure SCC Credentials"); + return; + } + finally { + MinionPendingRegistrationService.removeMinion(MINION_ID); + } + fail("Expected Exception not thrown"); + } + /** * Test registration of a free BYOS client at a SUMA PAYG Server * @throws Exception diff --git a/java/code/src/com/suse/manager/reactor/test/dummy_systeminfo_byos.json b/java/code/src/com/suse/manager/reactor/test/dummy_systeminfo_byos.json new file mode 100644 index 000000000000..d49292230ed0 --- /dev/null +++ b/java/code/src/com/suse/manager/reactor/test/dummy_systeminfo_byos.json @@ -0,0 +1,280 @@ +{ + "mgrcompat_|-sync_beacons_|-saltutil.sync_beacons_|-module_run": { + "comment": "Module function saltutil.sync_beacons executed", + "name": "saltutil.sync_beacons", + "start_time": "15:10:28.808934", + "result": true, + "duration": 93.715, + "__run_num__": 2, + "__sls__": "util.syncbeacons", + "changes": { + "ret": [] + }, + "__id__": "sync_beacons" + }, + "mgrcompat_|-status_uptime_|-status.uptime_|-module_run": { + "comment": "Module function status.uptime executed", + "name": "status.uptime", + "start_time": "15:10:28.902879", + "result": true, + "duration": 16.436, + "__run_num__": 3, + "__sls__": "util.systeminfo", + "changes": { + "ret": { + "users": 2, + "seconds": 27, + "since_t": 1551709288, + "days": 0, + "since_iso": "2019-03-04T14:21:28.933041", + "time": "0:0" + } + + }, + "__id__": "status_uptime" + }, + "mgrcompat_|-sync_grains_|-saltutil.sync_grains_|-module_run": { + "comment": "Module function saltutil.sync_grains executed", + "name": "saltutil.sync_grains", + "start_time": "15:10:27.968460", + "result": true, + "duration": 832.525, + "__run_num__": 1, + "__sls__": "util.syncgrains", + "changes": { + "ret": [] + }, + "__id__": "sync_grains" + }, + "mgrcompat_|-sync_modules_|-saltutil.sync_modules_|-module_run": { + "comment": "Module function saltutil.sync_modules executed", + "name": "saltutil.sync_modules", + "start_time": "15:10:27.664062", + "result": true, + "duration": 304.157, + "__run_num__": 0, + "__sls__": "util.syncmodules", + "changes": { + "ret": [] + }, + "__id__": "sync_modules" + }, + "mgrcompat_|-grains_update_|-grains.items_|-module_run": { + "comment": "Module function grains.item executed", + "name": "grains.item", + "start_time": "15:10:28.919644", + "result": true, + "duration": 2.556, + "__run_num__": 4, + "__sls__": "util.systeminfo", + "changes": { + "ret": { + "biosversion": "rel-1.7.5-0-ge51488c-20150524_160643-cloud127", + "kernel": "Linux", + "domain": "vagrant.local", + "biosreleasedate": "04/01/2014", + "zmqversion": "4.0.4", + "kernelrelease": "3.12.48-52.27-default", + "pythonpath": [ + "/usr/bin", + "/usr/lib/python27.zip", + "/usr/lib64/python2.7", + "/usr/lib64/python2.7/plat-linux2", + "/usr/lib64/python2.7/lib-tk", + "/usr/lib64/python2.7/lib-old", + "/usr/lib64/python2.7/lib-dynload", + "/usr/lib64/python2.7/site-packages", + "/usr/local/lib64/python2.7/site-packages", + "/usr/local/lib/python2.7/site-packages", + "/usr/lib/python2.7/site-packages" + ], + "instance_id": "aws", + "ip_interfaces": { + "lo": [ + "127.0.0.1", + "::1" + ], + "eth1": [ + "172.16.37.5", + "fe80::5054:ff:feb0:1da2" + ], + "eth0": [ + "192.168.121.35", + "fe80::5054:ff:fe4f:7102" + ] + }, + "shell": "/bin/bash", + "mem_total": 489, + "saltversioninfo": [ + 2015, + 8, + 2, + 0 + ], + "SSDs": [], + "server": "suma3pg.vagrant.local", + "id": "clisles12-suma3pg.vagrant.local", + "osrelease": "12", + "ps": "ps -efH", + "server_id": 1617825398, + "uuid": "75299898-533c-ff48-8b5c-be026df56f74", + "ip6_interfaces": { + "lo": [ + "::1" + ], + "eth1": [ + "fe80::5054:ff:feb0:1da2" + ], + "eth0": [ + "fe80::5054:ff:fe4f:7102" + ] + }, + "num_cpus": 1, + "hwaddr_interfaces": { + "lo": "00:00:00:00:00:00", + "eth1": "52:54:00:b0:1d:a2", + "eth0": "52:54:00:4f:71:02" + }, + "init": "systemd", + "ip4_interfaces": { + "lo": [ + "127.0.0.1" + ], + "eth1": [ + "172.16.37.5" + ], + "eth0": [ + "192.168.121.35" + ] + }, + "osfullname": "SLES", + "master": "suma3pg", + "ipv4": [ + "127.0.0.1", + "172.16.37.5", + "192.168.121.35" + ], + "ipv6": [ + "::1", + "fe80::5054:ff:fe4f:7102", + "fe80::5054:ff:feb0:1da2" + ], + "role": "client", + "cpusockets": 1, + "cpu_flags": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "rep_good", + "nopl", + "eagerfpu", + "pni", + "pclmulqdq", + "vmx", + "ssse3", + "fma", + "cx16", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "hypervisor", + "lahf_lm", + "abm", + "xsaveopt", + "vnmi", + "ept", + "fsgsbase", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid" + ], + "localhost": "clisles12-suma3pg", + "lsb_distrib_id": "SLES", + "fqdn_ip4": [ + "127.0.0.1" + ], + "fqdn_ip6": [], + "nodename": "clisles12-suma3pg", + "saltversion": "2015.8.2", + "lsb_distrib_release": "12", + "systemd": { + "version": "210", + "features": "+PAM +LIBWRAP +AUDIT +SELINUX -IMA +SYSVINIT +LIBCRYPTSETUP +GCRYPT +ACL +XZ +SECCOMP +APPARMOR" + }, + "saltpath": "/usr/lib/python2.7/site-packages/salt", + "host": "clisles12-suma3pg", + "os_family": "Suse", + "oscodename": "SUSE Linux Enterprise Server 12", + "gpus": [], + "pythonversion": [ + 2, + 7, + 9, + "final", + 0 + ], + "manufacturer": "QEMU", + "num_gpus": 0, + "virtual": "kvm", + "cpu_model": "Intel Xeon E312xx (Sandy Bridge)", + "fqdn": "clisles12-suma3pg.vagrant.local", + "fqdns": ["minion3sp2.tf.local", "minion3sp2.suse.local"], + "pythonexecutable": "/usr/bin/python", + "productname": "Standard PC (i440FX + PIIX, 1996)", + "osarch": "x86_64", + "cpuarch": "x86_64", + "lsb_distrib_codename": "SUSE Linux Enterprise Server 12", + "osrelease_info": [ + 12 + ], + "locale_info": { + "detectedencoding": "UTF-8", + "defaultlanguage": "en_US", + "defaultencoding": "UTF-8" + }, + "path": "/sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/lib/mit/bin:/usr/lib/mit/sbin", + "machine_id": "44da3fc9b97b6552cc668bcd56498fe5", + "os": "SUSE" + } + }, + "__id__": "grains_update" + } + } From a63f63b62f1798581967f0d4ddee06f641ab277c Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 09:35:24 +0200 Subject: [PATCH 109/127] install instance-flavor-check tool in cloud instances --- .../susemanager-sls/salt/packages/init.sls | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/susemanager-utils/susemanager-sls/salt/packages/init.sls b/susemanager-utils/susemanager-sls/salt/packages/init.sls index 4c66cb6940c6..6c80070dadf1 100644 --- a/susemanager-utils/susemanager-sls/salt/packages/init.sls +++ b/susemanager-utils/susemanager-sls/salt/packages/init.sls @@ -1,3 +1,7 @@ +include: + - util.syncstates + - .packages_{{ grains['machine_id'] }} + {%- if grains['os_family'] == 'Suse' and grains['osmajorrelease']|int > 11 and not grains['oscodename'] == 'openSUSE Leap 15.3'%} mgr_install_products: product.all_installed: @@ -11,6 +15,16 @@ mgr_install_products: {%- endif %} {%- endif %} -include: - - util.syncstates - - .packages_{{ grains['machine_id'] }} +{%- if grains['os_family'] == 'Suse' and grains['instance_id'] is defined %} +{# install flavor check tool in cloud instances to be able to detect payg instances #} +mgr_install_flavor_check: + pkg.installed: + - name: python-instance-billing-flavor-check + - require: + - file: mgrchannels_* +{%- if grains.get('__suse_reserved_saltutil_states_support', False) %} + - saltutil: sync_states +{%- else %} + - mgrcompat: sync_states +{%- endif %} +{%- endif %} From 92cf757d577406580a1cc5e6d875734ae62012da Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 25 Apr 2023 09:42:10 +0200 Subject: [PATCH 110/127] Add payg checks for scc forward Signed-off-by: Miguel Sama --- .../controllers/login/LoginController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java index 67c75fc6f4fa..4e75cca9bf62 100644 --- a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java +++ b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java @@ -24,11 +24,14 @@ import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.conf.sso.SSOConfig; import com.redhat.rhn.common.localization.LocalizationService; +import com.redhat.rhn.domain.credentials.Credentials; +import com.redhat.rhn.domain.credentials.CredentialsFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.security.AuthenticationServiceFactory; import com.redhat.rhn.manager.acl.AclManager; import com.redhat.rhn.manager.user.UserManager; +import com.suse.cloud.CloudPaygManager; import com.suse.manager.webui.utils.LoginHelper; import com.suse.utils.Json; @@ -38,10 +41,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.jetty.util.security.Credential; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; @@ -134,6 +139,18 @@ public static ModelAndView loginView(Request request, Response response) { model.put("webTheme", ConfigDefaults.get().getDefaultWebTheme()); model.put("diskspaceSeverity", LoginHelper.validateDiskSpaceAvailability()); + // Pay as you go code + boolean sccForwardWarning = false; + CloudPaygManager couldPaygManager = new CloudPaygManager(); + + if (couldPaygManager.isPaygInstance() && CredentialsFactory.listSCCCredentials().size() > 0 && + !ConfigDefaults.get().isForwardRegistrationEnabled()) { + sccForwardWarning = true; + } + + model.put("sccForwardWarning", Json.GSON.toJson(sccForwardWarning)); + + return new ModelAndView(model, "controllers/login/templates/login.jade"); } From e8fcb28152fd826f103bfff743a40692b97aaa3e Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 19 Apr 2023 14:40:06 +0200 Subject: [PATCH 111/127] Add new field `sccForwardWarning` --- .../suse/manager/webui/controllers/login/templates/login.jade | 1 + web/html/src/manager/login/login.renderer.tsx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade index 8de453ff48ae..ae264e09a3ce 100644 --- a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade +++ b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade @@ -58,6 +58,7 @@ html(lang=window.preferredLocale.replace("_", "-")) loginLength: '!{loginLength}', passwordLength: '!{passwordLength}', diskspaceSeverity: '#{diskspaceSeverity}', + sccForwardWarning: JSON.parse('!{sccForwardWarning}'), } ) validate(); diff --git a/web/html/src/manager/login/login.renderer.tsx b/web/html/src/manager/login/login.renderer.tsx index 7e9c77d3e3b9..1b8b64809425 100644 --- a/web/html/src/manager/login/login.renderer.tsx +++ b/web/html/src/manager/login/login.renderer.tsx @@ -19,6 +19,7 @@ export const renderer = ( loginLength, passwordLength, diskspaceSeverity, + sccForwardWarning, } ) => { const elementToRender = document.getElementById(id); @@ -38,6 +39,7 @@ export const renderer = ( loginLength={loginLength} passwordLength={passwordLength} diskspaceSeverity={diskspaceSeverity} + sccForwardWarning={sccForwardWarning} />, elementToRender ); From 736b536bbfac638320ea694beb41b0672215ac7e Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 25 Apr 2023 09:49:26 +0200 Subject: [PATCH 112/127] Pass new parameter `sccForwardWarning` to `getGlobalMessages` --- web/html/src/manager/login/susemanager/login.tsx | 3 ++- web/html/src/manager/login/uyuni/login.tsx | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/html/src/manager/login/susemanager/login.tsx b/web/html/src/manager/login/susemanager/login.tsx index 76f310da5b01..118d2d73870d 100644 --- a/web/html/src/manager/login/susemanager/login.tsx +++ b/web/html/src/manager/login/susemanager/login.tsx @@ -26,7 +26,8 @@ const SusemanagerThemeLogin = (props: ThemeProps) => { const globalMessages = getGlobalMessages( props.validationErrors, props.schemaUpgradeRequired, - props.diskspaceSeverity + props.diskspaceSeverity, + props.sccForwardWarning ); const formMessages = getFormMessages(success, messages); const errorMessages = globalMessages.concat(formMessages).filter((item) => item.severity !== "success"); diff --git a/web/html/src/manager/login/uyuni/login.tsx b/web/html/src/manager/login/uyuni/login.tsx index 0f0da7414c66..d08d18f021de 100644 --- a/web/html/src/manager/login/uyuni/login.tsx +++ b/web/html/src/manager/login/uyuni/login.tsx @@ -28,7 +28,12 @@ const UyuniThemeLogin = (props: ThemeProps) => {

    {product.bodyTitle}

    From 83e732d4b8571cdcc33c1d9540bdf5cb31b50d3f Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 25 Apr 2023 09:50:02 +0200 Subject: [PATCH 113/127] Add new parameter to props `sccForwardWarning` --- web/html/src/manager/login/login.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/src/manager/login/login.tsx b/web/html/src/manager/login/login.tsx index 33e6cc3485c8..089ec5210de3 100644 --- a/web/html/src/manager/login/login.tsx +++ b/web/html/src/manager/login/login.tsx @@ -52,6 +52,7 @@ type Props = { loginLength: string; passwordLength: string; diskspaceSeverity: string; + sccForwardWarning: boolean; }; export type ThemeProps = Props & { From c1932a7280d211f7d493733e78669f0251786588 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Tue, 25 Apr 2023 09:50:32 +0200 Subject: [PATCH 114/127] Add new check for `sccForwardWarning` --- web/html/src/manager/login/messages.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/html/src/manager/login/messages.tsx b/web/html/src/manager/login/messages.tsx index 7ea493422ffb..f2e4afa38f9c 100644 --- a/web/html/src/manager/login/messages.tsx +++ b/web/html/src/manager/login/messages.tsx @@ -2,7 +2,7 @@ import * as React from "react"; import { Messages, MessageType } from "components/messages"; -export const getGlobalMessages = (validationErrors, schemaUpgradeRequired, diskspaceSeverity) => { +export const getGlobalMessages = (validationErrors, schemaUpgradeRequired, diskspaceSeverity, sccForwardWarning) => { let messages: MessageType[] = []; if (validationErrors && validationErrors.length > 0) { @@ -48,6 +48,13 @@ export const getGlobalMessages = (validationErrors, schemaUpgradeRequired, disks } } + if (sccForwardWarning) { + const sccForwardWarningMessage = t( + "Forward registration data to SCC must be enabled for Pay As You Go instances." + ); + messages = messages.concat({ severity: "warning", text: sccForwardWarningMessage }); + } + return messages; }; From 8ab3ffb63fdd5a57e917a31349f0f4514793a9fc Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 7 Jun 2023 15:21:56 +0200 Subject: [PATCH 115/127] Add changelog Signed-off-by: Miguel Sama --- ...k-java.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning | 1 + ...lk-web.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning | 1 + 2 files changed, 2 insertions(+) create mode 100644 java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning create mode 100644 web/spacewalk-web.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning diff --git a/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning b/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning new file mode 100644 index 000000000000..61547e3c5f79 --- /dev/null +++ b/java/spacewalk-java.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning @@ -0,0 +1 @@ +- Add warning message in login UI for PAYG with SCC credentials and no forward registration. diff --git a/web/spacewalk-web.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning b/web/spacewalk-web.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning new file mode 100644 index 000000000000..61547e3c5f79 --- /dev/null +++ b/web/spacewalk-web.changes.mikeletux.Manager-4.3-suma-payg-scc-fw-warning @@ -0,0 +1 @@ +- Add warning message in login UI for PAYG with SCC credentials and no forward registration. From 9cb6f1b818256067329a68ab8e5dc1e502446cc2 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Wed, 7 Jun 2023 15:52:46 +0200 Subject: [PATCH 116/127] Get `PAYG_MANAGER` from `GlobalInstanceHolder` Signed-off-by: Miguel Sama --- .../manager/webui/controllers/login/LoginController.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java index 4e75cca9bf62..10f8832fcd30 100644 --- a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java +++ b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java @@ -20,18 +20,17 @@ import static spark.Spark.get; import static spark.Spark.post; +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.conf.sso.SSOConfig; import com.redhat.rhn.common.localization.LocalizationService; -import com.redhat.rhn.domain.credentials.Credentials; import com.redhat.rhn.domain.credentials.CredentialsFactory; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.security.AuthenticationServiceFactory; import com.redhat.rhn.manager.acl.AclManager; import com.redhat.rhn.manager.user.UserManager; -import com.suse.cloud.CloudPaygManager; import com.suse.manager.webui.utils.LoginHelper; import com.suse.utils.Json; @@ -41,12 +40,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.eclipse.jetty.util.security.Credential; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional; @@ -141,16 +138,14 @@ public static ModelAndView loginView(Request request, Response response) { // Pay as you go code boolean sccForwardWarning = false; - CloudPaygManager couldPaygManager = new CloudPaygManager(); - if (couldPaygManager.isPaygInstance() && CredentialsFactory.listSCCCredentials().size() > 0 && + if (GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance() && CredentialsFactory.listSCCCredentials().size() > 0 && !ConfigDefaults.get().isForwardRegistrationEnabled()) { sccForwardWarning = true; } model.put("sccForwardWarning", Json.GSON.toJson(sccForwardWarning)); - return new ModelAndView(model, "controllers/login/templates/login.jade"); } From fe0aadffa958a5da063061a7177180dd00049614 Mon Sep 17 00:00:00 2001 From: Miguel Sama Date: Fri, 23 Jun 2023 14:41:00 +0200 Subject: [PATCH 117/127] Amend warning message Signed-off-by: Miguel Sama --- web/html/src/manager/login/messages.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/src/manager/login/messages.tsx b/web/html/src/manager/login/messages.tsx index f2e4afa38f9c..d19ec29c6f76 100644 --- a/web/html/src/manager/login/messages.tsx +++ b/web/html/src/manager/login/messages.tsx @@ -50,7 +50,7 @@ export const getGlobalMessages = (validationErrors, schemaUpgradeRequired, disks if (sccForwardWarning) { const sccForwardWarningMessage = t( - "Forward registration data to SCC must be enabled for Pay As You Go instances." + "SUSE Manager pay-as-you-go instances must forward registration data to SCC when credentials are provided. Data will be sent independently of the configuration setting. To hide this warning please set 'forward_registration = 1' in rhn.conf." ); messages = messages.concat({ severity: "warning", text: sccForwardWarningMessage }); } From 6d47909f5fa9d1f02446b3acde6d46e95a7a9e73 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 13:31:51 +0200 Subject: [PATCH 118/127] ignore forwarding disabled in taskomatic job when instance is payg --- .../rhn/taskomatic/task/ForwardRegistrationTask.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/ForwardRegistrationTask.java b/java/code/src/com/redhat/rhn/taskomatic/task/ForwardRegistrationTask.java index 407f811f96ec..bd883245c3de 100644 --- a/java/code/src/com/redhat/rhn/taskomatic/task/ForwardRegistrationTask.java +++ b/java/code/src/com/redhat/rhn/taskomatic/task/ForwardRegistrationTask.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.taskomatic.task; +import com.redhat.rhn.GlobalInstanceHolder; import com.redhat.rhn.common.conf.Config; import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.credentials.Credentials; @@ -52,8 +53,15 @@ public String getConfigNamespace() { @Override public void execute(JobExecutionContext arg0) { if (!ConfigDefaults.get().isForwardRegistrationEnabled()) { - log.debug("Forwarding registrations disabled"); - return; + if (GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance() && + CredentialsFactory.listSCCCredentials().size() > 0) { + log.warn("SUSE Manager pay-as-you-go instances must forward registration data to SCC when " + + "credentials are provided. Data will be sent independently of the configuration setting."); + } + else { + log.debug("Forwarding registrations disabled"); + return; + } } if (Config.get().getString(ContentSyncManager.RESOURCE_PATH) == null) { From ccfcc6a273331095ba968dcceed31a22b192f8b0 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 13:42:28 +0200 Subject: [PATCH 119/127] simplify setting loging message --- .../webui/controllers/login/LoginController.java | 11 ++++------- .../webui/controllers/login/templates/login.jade | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java index 10f8832fcd30..fb02c52fde37 100644 --- a/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java +++ b/java/code/src/com/suse/manager/webui/controllers/login/LoginController.java @@ -137,14 +137,11 @@ public static ModelAndView loginView(Request request, Response response) { model.put("diskspaceSeverity", LoginHelper.validateDiskSpaceAvailability()); // Pay as you go code - boolean sccForwardWarning = false; + boolean sccForwardWarning = GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance() && + CredentialsFactory.listSCCCredentials().size() > 0 && + !ConfigDefaults.get().isForwardRegistrationEnabled(); - if (GlobalInstanceHolder.PAYG_MANAGER.isPaygInstance() && CredentialsFactory.listSCCCredentials().size() > 0 && - !ConfigDefaults.get().isForwardRegistrationEnabled()) { - sccForwardWarning = true; - } - - model.put("sccForwardWarning", Json.GSON.toJson(sccForwardWarning)); + model.put("sccForwardWarning", sccForwardWarning); return new ModelAndView(model, "controllers/login/templates/login.jade"); } diff --git a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade index ae264e09a3ce..ce35b02ab03c 100644 --- a/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade +++ b/java/code/src/com/suse/manager/webui/controllers/login/templates/login.jade @@ -58,7 +58,7 @@ html(lang=window.preferredLocale.replace("_", "-")) loginLength: '!{loginLength}', passwordLength: '!{passwordLength}', diskspaceSeverity: '#{diskspaceSeverity}', - sccForwardWarning: JSON.parse('!{sccForwardWarning}'), + sccForwardWarning: JSON.parse('#{sccForwardWarning}'), } ) validate(); From 062c0d4d169ea984110c4912c6562ae0326b6152 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 4 Aug 2023 14:17:11 +0200 Subject: [PATCH 120/127] call instance-flavor-check via sudo --- java/code/src/com/suse/cloud/CloudPaygManager.java | 2 +- spacewalk/config/etc/sudoers.d/spacewalk | 3 ++- ...walk-config.changes.mc.Manager-4.3-suma-payg-scc-fw-warning | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 spacewalk/config/spacewalk-config.changes.mc.Manager-4.3-suma-payg-scc-fw-warning diff --git a/java/code/src/com/suse/cloud/CloudPaygManager.java b/java/code/src/com/suse/cloud/CloudPaygManager.java index 302d2460bf3a..094d953e1fe1 100644 --- a/java/code/src/com/suse/cloud/CloudPaygManager.java +++ b/java/code/src/com/suse/cloud/CloudPaygManager.java @@ -116,7 +116,7 @@ protected boolean isFileExecutable(String filename) { */ protected String getInstanceType() throws ExecutionException { try { - Process proc = Runtime.getRuntime().exec("/usr/bin/instance-flavor-check"); + Process proc = Runtime.getRuntime().exec("sudo /usr/bin/instance-flavor-check"); proc.waitFor(); try (InputStream inputStream = proc.getInputStream()) { diff --git a/spacewalk/config/etc/sudoers.d/spacewalk b/spacewalk/config/etc/sudoers.d/spacewalk index e292b5efc3c5..f52f67d4386b 100644 --- a/spacewalk/config/etc/sudoers.d/spacewalk +++ b/spacewalk/config/etc/sudoers.d/spacewalk @@ -4,7 +4,8 @@ Cmnd_Alias CONFIG_RHN = /usr/sbin/rhn-sat-restart-silent,\ /usr/bin/rhn-bootstrap,\ /usr/bin/rhn-ssl-tool,\ /sbin/service taskomatic restart,\ - /usr/sbin/mgr-monitoring-ctl + /usr/sbin/mgr-monitoring-ctl,\ + /usr/bin/instance-flavor-check # The CONFIG_RHN commands are required for reconfiguration of a # running Red Hat Satellite. They should be enabled for proper operation diff --git a/spacewalk/config/spacewalk-config.changes.mc.Manager-4.3-suma-payg-scc-fw-warning b/spacewalk/config/spacewalk-config.changes.mc.Manager-4.3-suma-payg-scc-fw-warning new file mode 100644 index 000000000000..f0f206ac9793 --- /dev/null +++ b/spacewalk/config/spacewalk-config.changes.mc.Manager-4.3-suma-payg-scc-fw-warning @@ -0,0 +1 @@ +- allow calling instance-flavor-check via sudo From 78190d53a3774e55a5fb072fba9f57d92d74c1c1 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Sun, 6 Aug 2023 13:36:08 +0200 Subject: [PATCH 121/127] text after bootstrap has changed --- .../containerization/proxy_as_pod_basic_tests.feature | 4 ++-- .../build_validation/init_clients/alma9_minion.feature | 2 +- .../build_validation/init_clients/alma9_ssh_minion.feature | 2 +- .../build_validation/init_clients/centos7_minion.feature | 2 +- .../build_validation/init_clients/centos7_ssh_minion.feature | 2 +- .../build_validation/init_clients/debian10_minion.feature | 2 +- .../build_validation/init_clients/debian10_ssh_minion.feature | 2 +- .../build_validation/init_clients/debian11_minion.feature | 2 +- .../build_validation/init_clients/debian11_ssh_minion.feature | 2 +- .../build_validation/init_clients/liberty9_minion.feature | 2 +- .../build_validation/init_clients/liberty9_ssh_minion.feature | 2 +- .../build_validation/init_clients/monitoring_server.feature | 2 +- .../init_clients/opensuse154arm_minion.feature | 2 +- .../init_clients/opensuse154arm_ssh_minion.feature | 2 +- .../init_clients/opensuse155arm_minion.feature | 2 +- .../init_clients/opensuse155arm_ssh_minion.feature | 2 +- .../build_validation/init_clients/oracle9_minion.feature | 2 +- .../build_validation/init_clients/oracle9_ssh_minion.feature | 2 +- .../features/build_validation/init_clients/proxy.feature | 2 +- .../build_validation/init_clients/rhel9_minion.feature | 2 +- .../build_validation/init_clients/rhel9_ssh_minion.feature | 2 +- .../build_validation/init_clients/rocky8_minion.feature | 2 +- .../build_validation/init_clients/rocky8_ssh_minion.feature | 2 +- .../build_validation/init_clients/rocky9_minion.feature | 2 +- .../build_validation/init_clients/rocky9_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle12sp4_minion.feature | 2 +- .../build_validation/init_clients/sle12sp4_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle12sp5_minion.feature | 2 +- .../build_validation/init_clients/sle12sp5_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle15sp1_minion.feature | 2 +- .../build_validation/init_clients/sle15sp1_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle15sp2_minion.feature | 2 +- .../build_validation/init_clients/sle15sp2_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle15sp3_minion.feature | 2 +- .../build_validation/init_clients/sle15sp3_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle15sp4_minion.feature | 2 +- .../build_validation/init_clients/sle15sp4_ssh_minion.feature | 2 +- .../build_validation/init_clients/sle15sp5_minion.feature | 2 +- .../build_validation/init_clients/sle15sp5_ssh_minion.feature | 2 +- .../build_validation/init_clients/slemicro51_minion.feature | 2 +- .../init_clients/slemicro51_ssh_minion.feature | 2 +- .../build_validation/init_clients/slemicro52_minion.feature | 2 +- .../init_clients/slemicro52_ssh_minion.feature | 2 +- .../build_validation/init_clients/slemicro53_minion.feature | 2 +- .../init_clients/slemicro53_ssh_minion.feature | 2 +- .../build_validation/init_clients/slemicro54_minion.feature | 2 +- .../init_clients/slemicro54_ssh_minion.feature | 2 +- .../build_validation/init_clients/ubuntu1804_minion.feature | 2 +- .../init_clients/ubuntu1804_ssh_minion.feature | 2 +- .../build_validation/init_clients/ubuntu2004_minion.feature | 2 +- .../init_clients/ubuntu2004_ssh_minion.feature | 2 +- .../build_validation/init_clients/ubuntu2204_minion.feature | 2 +- .../init_clients/ubuntu2204_ssh_minion.feature | 2 +- .../github_validation/init_clients/sle_ssh_minion.feature | 2 +- testsuite/features/init_clients/buildhost_bootstrap.feature | 2 +- testsuite/features/init_clients/min_deblike_salt.feature | 2 +- testsuite/features/init_clients/min_rhlike_salt.feature | 2 +- testsuite/features/init_clients/min_virthost.feature | 2 +- .../init_clients/proxy_register_as_minion_with_gui.feature | 2 +- testsuite/features/init_clients/sle_minion.feature | 2 +- testsuite/features/init_clients/sle_ssh_minion.feature | 2 +- testsuite/features/secondary/min_activationkey.feature | 2 +- testsuite/features/secondary/min_baremetal_discovery.feature | 2 +- .../features/secondary/min_bootstrap_reactivation.feature | 4 ++-- testsuite/features/secondary/min_bootstrap_ssh_key.feature | 2 +- testsuite/features/secondary/min_deblike_ssh.feature | 4 ++-- .../features/secondary/min_move_from_and_to_proxy.feature | 2 +- testsuite/features/secondary/min_rhlike_ssh.feature | 4 ++-- testsuite/features/secondary/min_salt_mgrcompat_state.feature | 4 ++-- testsuite/features/secondary/min_salt_minions_page.feature | 2 +- testsuite/features/secondary/min_ssh_tunnel.feature | 2 +- .../features/secondary/minssh_move_from_and_to_proxy.feature | 2 +- testsuite/features/secondary/proxy_as_pod_basic_tests.feature | 4 ++-- 73 files changed, 79 insertions(+), 79 deletions(-) diff --git a/testsuite/features/build_validation/containerization/proxy_as_pod_basic_tests.feature b/testsuite/features/build_validation/containerization/proxy_as_pod_basic_tests.feature index 3a33942c8889..f54a4569d072 100644 --- a/testsuite/features/build_validation/containerization/proxy_as_pod_basic_tests.feature +++ b/testsuite/features/build_validation/containerization/proxy_as_pod_basic_tests.feature @@ -73,7 +73,7 @@ Feature: Register and test a Containerized Proxy And I enter "linux" as "password" And I select the hostname of "containerized_proxy" from "proxies" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Check the new bootstrapped minion in System Overview page When I follow the left menu "Salt > Keys" @@ -259,7 +259,7 @@ Feature: Register and test a Containerized Proxy And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Cleanup: Check the new bootstrapped minion in System Overview page When I follow the left menu "Salt > Keys" diff --git a/testsuite/features/build_validation/init_clients/alma9_minion.feature b/testsuite/features/build_validation/init_clients/alma9_minion.feature index 302795b36f05..daecdfb712df 100644 --- a/testsuite/features/build_validation/init_clients/alma9_minion.feature +++ b/testsuite/features/build_validation/init_clients/alma9_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Alma 9 Salt minion And I select "1-alma9_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "alma9_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/alma9_ssh_minion.feature b/testsuite/features/build_validation/init_clients/alma9_ssh_minion.feature index fce17ac212c6..bc8e4cfdff79 100644 --- a/testsuite/features/build_validation/init_clients/alma9_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/alma9_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a Alma 9 Salt SSH minion And I select "1-alma9_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "alma9_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/centos7_minion.feature b/testsuite/features/build_validation/init_clients/centos7_minion.feature index 97d1a9873656..5b6781ba37e8 100644 --- a/testsuite/features/build_validation/init_clients/centos7_minion.feature +++ b/testsuite/features/build_validation/init_clients/centos7_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a CentOS 7 Salt minion And I select "1-centos7_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "centos7_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/centos7_ssh_minion.feature b/testsuite/features/build_validation/init_clients/centos7_ssh_minion.feature index a15c44e30b20..ae58899496e2 100644 --- a/testsuite/features/build_validation/init_clients/centos7_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/centos7_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a CentOS 7 Salt SSH minion And I select "1-centos7_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "centos7_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/debian10_minion.feature b/testsuite/features/build_validation/init_clients/debian10_minion.feature index f0cad0235269..93394c644517 100644 --- a/testsuite/features/build_validation/init_clients/debian10_minion.feature +++ b/testsuite/features/build_validation/init_clients/debian10_minion.feature @@ -23,7 +23,7 @@ Feature: Bootstrap a Debian 10 Salt minion And I select "1-debian10_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "debian10_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/debian10_ssh_minion.feature b/testsuite/features/build_validation/init_clients/debian10_ssh_minion.feature index 0d1765e568ed..e15a81333926 100644 --- a/testsuite/features/build_validation/init_clients/debian10_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/debian10_ssh_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Debian 10 Salt SSH minion And I select the hostname of "proxy" from "proxies" if present And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "debian10_ssh_minion" Scenario: Check events history for failures on SSH-managed Debian 10 minion diff --git a/testsuite/features/build_validation/init_clients/debian11_minion.feature b/testsuite/features/build_validation/init_clients/debian11_minion.feature index 17fb28a794b4..d30b18106265 100644 --- a/testsuite/features/build_validation/init_clients/debian11_minion.feature +++ b/testsuite/features/build_validation/init_clients/debian11_minion.feature @@ -23,7 +23,7 @@ Feature: Bootstrap a Debian 11 Salt minion And I select "1-debian11_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "debian11_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/debian11_ssh_minion.feature b/testsuite/features/build_validation/init_clients/debian11_ssh_minion.feature index 7dfd868e3adf..00e42d87dd35 100644 --- a/testsuite/features/build_validation/init_clients/debian11_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/debian11_ssh_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Debian 11 Salt SSH minion And I select the hostname of "proxy" from "proxies" if present And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "debian11_ssh_minion" Scenario: Check events history for failures on SSH-managed Debian 11 minion diff --git a/testsuite/features/build_validation/init_clients/liberty9_minion.feature b/testsuite/features/build_validation/init_clients/liberty9_minion.feature index 11adbb9dd2a3..28c259f40390 100644 --- a/testsuite/features/build_validation/init_clients/liberty9_minion.feature +++ b/testsuite/features/build_validation/init_clients/liberty9_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Liberty Linux 9 Salt minion And I select "1-liberty9_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "liberty9_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/liberty9_ssh_minion.feature b/testsuite/features/build_validation/init_clients/liberty9_ssh_minion.feature index 65738e61f02d..5b1c4e4aa64e 100644 --- a/testsuite/features/build_validation/init_clients/liberty9_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/liberty9_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a Liberty Linux 9 Salt SSH minion And I select "1-liberty9_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "liberty9_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/monitoring_server.feature b/testsuite/features/build_validation/init_clients/monitoring_server.feature index 71508218c9ac..0f602d509d92 100644 --- a/testsuite/features/build_validation/init_clients/monitoring_server.feature +++ b/testsuite/features/build_validation/init_clients/monitoring_server.feature @@ -20,7 +20,7 @@ Feature: Bootstrap the monitoring server And I select "1-monitoring_server_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "monitoring_server" Scenario: Check the new bootstrapped monitoring server in System Overview page diff --git a/testsuite/features/build_validation/init_clients/opensuse154arm_minion.feature b/testsuite/features/build_validation/init_clients/opensuse154arm_minion.feature index 6ed9428175c3..c308514121a6 100644 --- a/testsuite/features/build_validation/init_clients/opensuse154arm_minion.feature +++ b/testsuite/features/build_validation/init_clients/opensuse154arm_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a openSUSE 15.4 ARM Salt minion And I select "1-opensuse154arm_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "opensuse154arm_minion" Scenario: Check the new bootstrapped openSUSE 15.4 ARM minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/opensuse154arm_ssh_minion.feature b/testsuite/features/build_validation/init_clients/opensuse154arm_ssh_minion.feature index da401ade5825..0f2ab11d187b 100644 --- a/testsuite/features/build_validation/init_clients/opensuse154arm_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/opensuse154arm_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a openSUSE 15.4 ARM Salt SSH minion And I select "1-opensuse154arm_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "opensuse154arm_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/opensuse155arm_minion.feature b/testsuite/features/build_validation/init_clients/opensuse155arm_minion.feature index 9fb8fa3f8880..b0ee45e1c320 100644 --- a/testsuite/features/build_validation/init_clients/opensuse155arm_minion.feature +++ b/testsuite/features/build_validation/init_clients/opensuse155arm_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a openSUSE 15.5 ARM Salt minion And I select "1-opensuse155arm_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "opensuse155arm_minion" Scenario: Check the new bootstrapped openSUSE 15.5 ARM minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/opensuse155arm_ssh_minion.feature b/testsuite/features/build_validation/init_clients/opensuse155arm_ssh_minion.feature index 634155482081..cdcbcd961df5 100644 --- a/testsuite/features/build_validation/init_clients/opensuse155arm_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/opensuse155arm_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a openSUSE 15.5 ARM Salt SSH minion And I select "1-opensuse155arm_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "opensuse155arm_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/oracle9_minion.feature b/testsuite/features/build_validation/init_clients/oracle9_minion.feature index 3c7807d6068e..82e0b11beda9 100644 --- a/testsuite/features/build_validation/init_clients/oracle9_minion.feature +++ b/testsuite/features/build_validation/init_clients/oracle9_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Oracle 9 Salt minion And I select "1-oracle9_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "oracle9_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/oracle9_ssh_minion.feature b/testsuite/features/build_validation/init_clients/oracle9_ssh_minion.feature index 01705cb060a9..e3387e49e686 100644 --- a/testsuite/features/build_validation/init_clients/oracle9_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/oracle9_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a Oracle 9 Salt SSH minion And I select "1-oracle9_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "oracle9_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/proxy.feature b/testsuite/features/build_validation/init_clients/proxy.feature index 922051021b11..17acbc7f5833 100644 --- a/testsuite/features/build_validation/init_clients/proxy.feature +++ b/testsuite/features/build_validation/init_clients/proxy.feature @@ -31,7 +31,7 @@ Feature: Setup SUSE Manager proxy And I enter "linux" as "password" And I select "1-proxy_key" from "activationKeys" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "proxy" # bsc#1085436 - Apache returns 403 Forbidden after a zypper refresh on minion diff --git a/testsuite/features/build_validation/init_clients/rhel9_minion.feature b/testsuite/features/build_validation/init_clients/rhel9_minion.feature index 5bb841e27c2e..844c9deca34d 100644 --- a/testsuite/features/build_validation/init_clients/rhel9_minion.feature +++ b/testsuite/features/build_validation/init_clients/rhel9_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Rhel 9 Salt minion And I select "1-rhel9_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rhel9_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/rhel9_ssh_minion.feature b/testsuite/features/build_validation/init_clients/rhel9_ssh_minion.feature index e4fcc281ce4d..90fd068c73f8 100644 --- a/testsuite/features/build_validation/init_clients/rhel9_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/rhel9_ssh_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Rhel 9 SSH minion And I select "1-rhel9_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rhel9_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/rocky8_minion.feature b/testsuite/features/build_validation/init_clients/rocky8_minion.feature index cb3da29e52dc..b2c4eb635e6b 100644 --- a/testsuite/features/build_validation/init_clients/rocky8_minion.feature +++ b/testsuite/features/build_validation/init_clients/rocky8_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Rocky 8 Salt minion And I select "1-rocky8_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rocky8_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/rocky8_ssh_minion.feature b/testsuite/features/build_validation/init_clients/rocky8_ssh_minion.feature index c6a247a50d5d..f583ea733eee 100644 --- a/testsuite/features/build_validation/init_clients/rocky8_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/rocky8_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a Rocky 8 Salt SSH minion And I select "1-rocky8_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rocky8_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/rocky9_minion.feature b/testsuite/features/build_validation/init_clients/rocky9_minion.feature index 447ca7467602..d7b968bcf896 100644 --- a/testsuite/features/build_validation/init_clients/rocky9_minion.feature +++ b/testsuite/features/build_validation/init_clients/rocky9_minion.feature @@ -21,7 +21,7 @@ Feature: Bootstrap a Rocky 9 Salt minion And I select "1-rocky9_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rocky9_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/rocky9_ssh_minion.feature b/testsuite/features/build_validation/init_clients/rocky9_ssh_minion.feature index bc4738f24c8c..87597a82b9c3 100644 --- a/testsuite/features/build_validation/init_clients/rocky9_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/rocky9_ssh_minion.feature @@ -22,7 +22,7 @@ Feature: Bootstrap a Rocky 9 Salt SSH minion And I select "1-rocky9_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "rocky9_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle12sp4_minion.feature b/testsuite/features/build_validation/init_clients/sle12sp4_minion.feature index ba040808d6eb..f5ba62bbf55a 100644 --- a/testsuite/features/build_validation/init_clients/sle12sp4_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle12sp4_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 12 SP4 Salt minion And I select "1-sle12sp4_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle12sp4_minion" Scenario: Check the new bootstrapped SLES 12 SP4 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle12sp4_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle12sp4_ssh_minion.feature index 1f5d7d9e971d..c1d970afa1aa 100644 --- a/testsuite/features/build_validation/init_clients/sle12sp4_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle12sp4_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 12 SP4 Salt SSH minion And I select "1-sle12sp4_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle12sp4_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle12sp5_minion.feature b/testsuite/features/build_validation/init_clients/sle12sp5_minion.feature index 55b138d5ab07..7f6d1b2c9af2 100644 --- a/testsuite/features/build_validation/init_clients/sle12sp5_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle12sp5_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 12 SP5 Salt minion And I select "1-sle12sp5_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle12sp5_minion" Scenario: Check the new bootstrapped SLES 12 SP5 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle12sp5_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle12sp5_ssh_minion.feature index d250b3c5d37f..f92c4b270b19 100644 --- a/testsuite/features/build_validation/init_clients/sle12sp5_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle12sp5_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 12 SP5 Salt SSH minion And I select "1-sle12sp5_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle12sp5_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle15sp1_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp1_minion.feature index c6928151ba3e..239a0e96d378 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp1_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp1_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 15 SP1 Salt minion And I select "1-sle15sp1_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp1_minion" Scenario: Check the new bootstrapped SLES 15 SP1 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle15sp1_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp1_ssh_minion.feature index 769257930298..935483670b4b 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp1_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp1_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 15 SP1 Salt SSH minion And I select "1-sle15sp1_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp1_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle15sp2_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp2_minion.feature index 6691f66bb86e..69680b671ad8 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp2_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp2_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 15 SP2 Salt minion And I select "1-sle15sp2_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp2_minion" Scenario: Check the new bootstrapped SLES 15 SP2 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle15sp2_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp2_ssh_minion.feature index c22e32b684e6..d78c70c9a1c7 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp2_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp2_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 15 SP2 Salt SSH minion And I select "1-sle15sp2_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp2_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle15sp3_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp3_minion.feature index 53803f7f5b3f..c89b75c21c73 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp3_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp3_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 15 SP3 Salt minion And I select "1-sle15sp3_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp3_minion" Scenario: Check the new bootstrapped SLES 15 SP3 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle15sp3_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp3_ssh_minion.feature index b2fd06d9f3b8..e76c1bde3c52 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp3_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp3_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 15 SP3 Salt SSH minion And I select "1-sle15sp3_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp3_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle15sp4_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp4_minion.feature index 3d22707f1d9d..544b3cdb0753 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp4_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp4_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 15 SP4 Salt minion And I select "1-sle15sp4_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp4_minion" Scenario: Check the new bootstrapped SLES 15 SP4 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle15sp4_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp4_ssh_minion.feature index 99c89cbc398d..dfe31602cc15 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp4_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp4_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 15 SP4 Salt SSH minion And I select "1-sle15sp4_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp4_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/sle15sp5_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp5_minion.feature index 2dea2e1023f3..a05f67329d9a 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp5_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp5_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLES 15 SP5 Salt minion And I select "1-sle15sp5_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp5_minion" Scenario: Check the new bootstrapped SLES 15 SP5 minion in System Overview page diff --git a/testsuite/features/build_validation/init_clients/sle15sp5_ssh_minion.feature b/testsuite/features/build_validation/init_clients/sle15sp5_ssh_minion.feature index 8ca2f86d461c..6adddc3b9a19 100644 --- a/testsuite/features/build_validation/init_clients/sle15sp5_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/sle15sp5_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLES 15 SP5 Salt SSH minion And I select "1-sle15sp5_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle15sp5_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/slemicro51_minion.feature b/testsuite/features/build_validation/init_clients/slemicro51_minion.feature index 07fbb79d70b8..328005121195 100644 --- a/testsuite/features/build_validation/init_clients/slemicro51_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro51_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLE Micro 5.1 Salt minion And I select "1-slemicro51_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Reboot the SLE Micro 5.1 minion and wait until reboot is completed When I reboot the "slemicro51_minion" minion through SSH diff --git a/testsuite/features/build_validation/init_clients/slemicro51_ssh_minion.feature b/testsuite/features/build_validation/init_clients/slemicro51_ssh_minion.feature index 46edd8bdb141..324cbe64d6a9 100644 --- a/testsuite/features/build_validation/init_clients/slemicro51_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro51_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLE Micro 5.1 Salt SSH minion And I select "1-slemicro51_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "slemicro51_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/slemicro52_minion.feature b/testsuite/features/build_validation/init_clients/slemicro52_minion.feature index 645f2de78cc2..539559ac88fc 100644 --- a/testsuite/features/build_validation/init_clients/slemicro52_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro52_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLE Micro 5.2 Salt minion And I select "1-slemicro52_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Reboot the SLE Micro 5.2 minion and wait until reboot is completed When I reboot the "slemicro52_minion" minion through SSH diff --git a/testsuite/features/build_validation/init_clients/slemicro52_ssh_minion.feature b/testsuite/features/build_validation/init_clients/slemicro52_ssh_minion.feature index e79e94b44e49..f0e3ec2b6ae4 100644 --- a/testsuite/features/build_validation/init_clients/slemicro52_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro52_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLE Micro 5.2 Salt SSH minion And I select "1-slemicro52_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "slemicro52_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/slemicro53_minion.feature b/testsuite/features/build_validation/init_clients/slemicro53_minion.feature index 3202b6105b88..887b8f46f0d2 100644 --- a/testsuite/features/build_validation/init_clients/slemicro53_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro53_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLE Micro 5.3 Salt minion And I select "1-slemicro53_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Reboot the SLE Micro 5.3 minion and wait until reboot is completed When I reboot the "slemicro53_minion" minion through SSH diff --git a/testsuite/features/build_validation/init_clients/slemicro53_ssh_minion.feature b/testsuite/features/build_validation/init_clients/slemicro53_ssh_minion.feature index 114779dad1ac..14eba449917c 100644 --- a/testsuite/features/build_validation/init_clients/slemicro53_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro53_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLE Micro 5.3 Salt SSH minion And I select "1-slemicro53_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "slemicro53_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/slemicro54_minion.feature b/testsuite/features/build_validation/init_clients/slemicro54_minion.feature index d5f3405f2876..69c76e5cef09 100644 --- a/testsuite/features/build_validation/init_clients/slemicro54_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro54_minion.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a SLE Micro 5.4 Salt minion And I select "1-slemicro54_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Reboot the SLE Micro 5.4 minion and wait until reboot is completed When I reboot the "slemicro54_minion" minion through SSH diff --git a/testsuite/features/build_validation/init_clients/slemicro54_ssh_minion.feature b/testsuite/features/build_validation/init_clients/slemicro54_ssh_minion.feature index 4dea9c8fa60f..e97c1eca0908 100644 --- a/testsuite/features/build_validation/init_clients/slemicro54_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/slemicro54_ssh_minion.feature @@ -19,7 +19,7 @@ Feature: Bootstrap a SLE Micro 5.4 Salt SSH minion And I select "1-slemicro54_ssh_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "slemicro54_ssh_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/ubuntu1804_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu1804_minion.feature index 95263754f153..afe2ec8dba8c 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu1804_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu1804_minion.feature @@ -23,7 +23,7 @@ Feature: Bootstrap a Ubuntu 18.04 Salt minion And I select "1-ubuntu1804_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu1804_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/ubuntu1804_ssh_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu1804_ssh_minion.feature index 9390281297c6..effd8356259c 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu1804_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu1804_ssh_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Ubuntu 18.04 Salt SSH minion And I select the hostname of "proxy" from "proxies" if present And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu1804_ssh_minion" Scenario: Check events history for failures on SSH-managed Ubuntu 18.04 minion diff --git a/testsuite/features/build_validation/init_clients/ubuntu2004_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu2004_minion.feature index 3af831cd726a..9649abf2f6a7 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu2004_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu2004_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Ubuntu 20.04 Salt minion And I select "1-ubuntu2004_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu2004_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/ubuntu2004_ssh_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu2004_ssh_minion.feature index 078b019f4ebc..109dbc6cd351 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu2004_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu2004_ssh_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Ubuntu 20.04 Salt SSH minion And I select the hostname of "proxy" from "proxies" if present And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu2004_ssh_minion" Scenario: Check events history for failures on SSH-managed Ubuntu 20.04 minion diff --git a/testsuite/features/build_validation/init_clients/ubuntu2204_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu2204_minion.feature index f3c508367e67..6896fd21deb2 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu2204_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu2204_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Ubuntu 22.04 Salt minion And I select "1-ubuntu2204_minion_key" from "activationKeys" And I select the hostname of "proxy" from "proxies" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu2204_minion" @proxy diff --git a/testsuite/features/build_validation/init_clients/ubuntu2204_ssh_minion.feature b/testsuite/features/build_validation/init_clients/ubuntu2204_ssh_minion.feature index 96befdda5234..3195dc212fa8 100644 --- a/testsuite/features/build_validation/init_clients/ubuntu2204_ssh_minion.feature +++ b/testsuite/features/build_validation/init_clients/ubuntu2204_ssh_minion.feature @@ -24,7 +24,7 @@ Feature: Bootstrap a Ubuntu 22.04 Salt SSH minion And I select the hostname of "proxy" from "proxies" And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ubuntu2204_ssh_minion" Scenario: Check events history for failures on SSH-managed Ubuntu 22.04 minion diff --git a/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature b/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature index 2c1d74e23103..0958f997dc76 100644 --- a/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature +++ b/testsuite/features/github_validation/init_clients/sle_ssh_minion.feature @@ -14,7 +14,7 @@ Feature: Bootstrap a Salt host managed via salt-ssh And I enter the hostname of "ssh_minion" as "hostname" And I enter "linux" as "password" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "ssh_minion", refreshing the page diff --git a/testsuite/features/init_clients/buildhost_bootstrap.feature b/testsuite/features/init_clients/buildhost_bootstrap.feature index 9650f68ffbe3..c4e76d001b5d 100644 --- a/testsuite/features/init_clients/buildhost_bootstrap.feature +++ b/testsuite/features/init_clients/buildhost_bootstrap.feature @@ -25,7 +25,7 @@ Feature: Bootstrap a build host via the GUI And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Check the new bootstrapped build host in System Overview page When I follow the left menu "Salt > Keys" diff --git a/testsuite/features/init_clients/min_deblike_salt.feature b/testsuite/features/init_clients/min_deblike_salt.feature index d11490067d5d..8d052b3eb8ef 100644 --- a/testsuite/features/init_clients/min_deblike_salt.feature +++ b/testsuite/features/init_clients/min_deblike_salt.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a Debian-like minion and do some basic operations on it And I select "1-DEBLIKE-KEY" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "deblike_minion", refreshing the page And I wait until onboarding is completed for "deblike_minion" diff --git a/testsuite/features/init_clients/min_rhlike_salt.feature b/testsuite/features/init_clients/min_rhlike_salt.feature index 38f713842e7e..348ef0222653 100644 --- a/testsuite/features/init_clients/min_rhlike_salt.feature +++ b/testsuite/features/init_clients/min_rhlike_salt.feature @@ -20,7 +20,7 @@ Feature: Bootstrap a Red Hat-like minion and do some basic operations on it And I select "1-RH-LIKE-KEY" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "rhlike_minion", refreshing the page And I wait until onboarding is completed for "rhlike_minion" diff --git a/testsuite/features/init_clients/min_virthost.feature b/testsuite/features/init_clients/min_virthost.feature index 567aef36480c..0e57b759923b 100644 --- a/testsuite/features/init_clients/min_virthost.feature +++ b/testsuite/features/init_clients/min_virthost.feature @@ -31,7 +31,7 @@ Feature: Bootstrap a virtualization host minion and set it up for virtualization And I select "1-KVM-TEST" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "kvm_server" Scenario: Show the KVM host system overview diff --git a/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature b/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature index db15c9fd345d..c36e9b885705 100644 --- a/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature +++ b/testsuite/features/init_clients/proxy_register_as_minion_with_gui.feature @@ -32,7 +32,7 @@ Feature: Setup Uyuni proxy And I enter "linux" as "password" And I select "1-PROXY-KEY-x86_64" from "activationKeys" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Wait until the proxy appears When I wait until onboarding is completed for "proxy" diff --git a/testsuite/features/init_clients/sle_minion.feature b/testsuite/features/init_clients/sle_minion.feature index dd383040a206..ee9c10f35b0c 100644 --- a/testsuite/features/init_clients/sle_minion.feature +++ b/testsuite/features/init_clients/sle_minion.feature @@ -17,7 +17,7 @@ Feature: Bootstrap a Salt minion via the GUI And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Check the new bootstrapped minion in System List page When I follow the left menu "Salt > Keys" diff --git a/testsuite/features/init_clients/sle_ssh_minion.feature b/testsuite/features/init_clients/sle_ssh_minion.feature index dc98f1c91739..241dc81a8784 100644 --- a/testsuite/features/init_clients/sle_ssh_minion.feature +++ b/testsuite/features/init_clients/sle_ssh_minion.feature @@ -15,7 +15,7 @@ Feature: Bootstrap a Salt host managed via salt-ssh And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "ssh_minion", refreshing the page And I wait until onboarding is completed for "ssh_minion" diff --git a/testsuite/features/secondary/min_activationkey.feature b/testsuite/features/secondary/min_activationkey.feature index 136638b1d5b5..6db4ce4bf6d4 100644 --- a/testsuite/features/secondary/min_activationkey.feature +++ b/testsuite/features/secondary/min_activationkey.feature @@ -70,7 +70,7 @@ Feature: Bootstrap a Salt minion via the GUI with an activation key And I select "1-MINION-TEST" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "sle_minion", refreshing the page And I wait until onboarding is completed for "sle_minion" diff --git a/testsuite/features/secondary/min_baremetal_discovery.feature b/testsuite/features/secondary/min_baremetal_discovery.feature index 8ba15a7a0e85..17b6cc660695 100644 --- a/testsuite/features/secondary/min_baremetal_discovery.feature +++ b/testsuite/features/secondary/min_baremetal_discovery.feature @@ -147,7 +147,7 @@ Feature: Bare metal discovery And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Cleanup: remove remaining systems from SSM after bare metal tests When I follow "clear-ssm" diff --git a/testsuite/features/secondary/min_bootstrap_reactivation.feature b/testsuite/features/secondary/min_bootstrap_reactivation.feature index 7cc6ea75a153..3baf8f8e8eb4 100644 --- a/testsuite/features/secondary/min_bootstrap_reactivation.feature +++ b/testsuite/features/secondary/min_bootstrap_reactivation.feature @@ -53,7 +53,7 @@ Feature: Bootstrapping with reactivation key And I enter the reactivation key of "sle_minion" And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "sle_minion", refreshing the page And I wait until onboarding is completed for "sle_minion" @@ -84,7 +84,7 @@ Feature: Bootstrapping with reactivation key And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "sle_minion", refreshing the page And I wait until onboarding is completed for "sle_minion" diff --git a/testsuite/features/secondary/min_bootstrap_ssh_key.feature b/testsuite/features/secondary/min_bootstrap_ssh_key.feature index 094e36377d5a..f5b545846107 100644 --- a/testsuite/features/secondary/min_bootstrap_ssh_key.feature +++ b/testsuite/features/secondary/min_bootstrap_ssh_key.feature @@ -55,7 +55,7 @@ Feature: Bootstrap a Salt minion via the GUI using SSH key And I enter "linux" as "privKeyPwd" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Check new minion bootstrapped with SSH key in System Overview page When I follow the left menu "Salt > Keys" diff --git a/testsuite/features/secondary/min_deblike_ssh.feature b/testsuite/features/secondary/min_deblike_ssh.feature index 670b3473a3f6..a7136e18347f 100644 --- a/testsuite/features/secondary/min_deblike_ssh.feature +++ b/testsuite/features/secondary/min_deblike_ssh.feature @@ -38,7 +38,7 @@ Feature: Bootstrap a SSH-managed Debian-like minion and do some basic operations And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "deblike_minion", refreshing the page And I wait until onboarding is completed for "deblike_minion" @@ -107,7 +107,7 @@ Feature: Bootstrap a SSH-managed Debian-like minion and do some basic operations And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "deblike_minion", refreshing the page And I wait until onboarding is completed for "deblike_minion" diff --git a/testsuite/features/secondary/min_move_from_and_to_proxy.feature b/testsuite/features/secondary/min_move_from_and_to_proxy.feature index d08ec4685e3b..a91c34fc0ed3 100644 --- a/testsuite/features/secondary/min_move_from_and_to_proxy.feature +++ b/testsuite/features/secondary/min_move_from_and_to_proxy.feature @@ -31,7 +31,7 @@ Feature: Move a minion from a proxy to direct connection And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle_minion" Scenario: Check the new bootstrapped minion in System Overview page diff --git a/testsuite/features/secondary/min_rhlike_ssh.feature b/testsuite/features/secondary/min_rhlike_ssh.feature index db1759e6130c..93860b6a6ce6 100644 --- a/testsuite/features/secondary/min_rhlike_ssh.feature +++ b/testsuite/features/secondary/min_rhlike_ssh.feature @@ -37,7 +37,7 @@ Feature: Bootstrap a SSH-managed Red Hat-like minion and do some basic operation And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "rhlike_minion", refreshing the page And I wait until onboarding is completed for "rhlike_minion" @@ -107,7 +107,7 @@ Feature: Bootstrap a SSH-managed Red Hat-like minion and do some basic operation And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I follow the left menu "Systems > System List > All" And I wait until I see the name of "rhlike_minion", refreshing the page And I wait until onboarding is completed for "rhlike_minion" diff --git a/testsuite/features/secondary/min_salt_mgrcompat_state.feature b/testsuite/features/secondary/min_salt_mgrcompat_state.feature index 2aa9bbbd6526..069c142b7d6d 100644 --- a/testsuite/features/secondary/min_salt_mgrcompat_state.feature +++ b/testsuite/features/secondary/min_salt_mgrcompat_state.feature @@ -61,7 +61,7 @@ Feature: Verify that Salt mgrcompat state works when the new module.run syntax i And I enter "linux" as "password" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle_minion" Scenario: Check if onboarding for the minion with the new module.run syntax was successful @@ -104,5 +104,5 @@ Feature: Verify that Salt mgrcompat state works when the new module.run syntax i And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle_minion" diff --git a/testsuite/features/secondary/min_salt_minions_page.feature b/testsuite/features/secondary/min_salt_minions_page.feature index 5d325f301cbe..5e40216e202a 100644 --- a/testsuite/features/secondary/min_salt_minions_page.feature +++ b/testsuite/features/secondary/min_salt_minions_page.feature @@ -86,5 +86,5 @@ Feature: Management of minion keys And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "sle_minion" diff --git a/testsuite/features/secondary/min_ssh_tunnel.feature b/testsuite/features/secondary/min_ssh_tunnel.feature index d2f692e64c08..629afd41cd6f 100644 --- a/testsuite/features/secondary/min_ssh_tunnel.feature +++ b/testsuite/features/secondary/min_ssh_tunnel.feature @@ -35,7 +35,7 @@ Feature: Register a Salt system to be managed via SSH tunnel And I select the hostname of "proxy" from "proxies" if present And I check "manageWithSSH" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ssh_minion" Scenario: The contact method is SSH tunnel on this minion diff --git a/testsuite/features/secondary/minssh_move_from_and_to_proxy.feature b/testsuite/features/secondary/minssh_move_from_and_to_proxy.feature index dfbaf28e2d90..c354b6f83039 100644 --- a/testsuite/features/secondary/minssh_move_from_and_to_proxy.feature +++ b/testsuite/features/secondary/minssh_move_from_and_to_proxy.feature @@ -36,7 +36,7 @@ Feature: Move a SSH minion from a proxy to direct connection And I select "1-SUSE-SSH-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" if present And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text And I wait until onboarding is completed for "ssh_minion" Scenario: Check initial connection from minion to proxy diff --git a/testsuite/features/secondary/proxy_as_pod_basic_tests.feature b/testsuite/features/secondary/proxy_as_pod_basic_tests.feature index 02bb53183d59..0b3ca0b052ac 100644 --- a/testsuite/features/secondary/proxy_as_pod_basic_tests.feature +++ b/testsuite/features/secondary/proxy_as_pod_basic_tests.feature @@ -85,7 +85,7 @@ Feature: Register and test a Containerized Proxy And I enter "linux" as "password" And I select the hostname of "containerized_proxy" from "proxies" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Check the new bootstrapped minion in System Overview page When I follow the left menu "Salt > Keys" @@ -272,7 +272,7 @@ Feature: Register and test a Containerized Proxy And I select "1-SUSE-KEY-x86_64" from "activationKeys" And I select the hostname of "proxy" from "proxies" And I click on "Bootstrap" - And I wait until I see "Successfully bootstrapped host!" text + And I wait until I see "Bootstrap process initiated." text Scenario: Cleanup: Check the new bootstrapped minion in System Overview page When I follow the left menu "Salt > Keys" From 39d764604d9ad32eb34d06c4770634bc0524a797 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Mon, 7 Aug 2023 13:47:51 +0200 Subject: [PATCH 122/127] implement assertNotContains different --- java/code/src/com/redhat/rhn/common/util/Asserts.java | 11 ----------- .../src/com/redhat/rhn/testing/RhnBaseTestCase.java | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/java/code/src/com/redhat/rhn/common/util/Asserts.java b/java/code/src/com/redhat/rhn/common/util/Asserts.java index 503e469db463..8ea74b9fb1a4 100644 --- a/java/code/src/com/redhat/rhn/common/util/Asserts.java +++ b/java/code/src/com/redhat/rhn/common/util/Asserts.java @@ -172,15 +172,4 @@ public static void assertEquals(int expected, int actual, "'"); } } - - /** - * Assert that coll does not contain elem - * @param coll a collection - * @param elem the element that should not be in the collection - */ - public static void assertNotContains(Collection coll, Object elem) { - if (coll.contains(elem)) { - fail("Expected " + elem + " to not be in " + coll); - } - } } diff --git a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java index 0a58b5f5f9a9..8772e95eaf0e 100644 --- a/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java +++ b/java/code/src/com/redhat/rhn/testing/RhnBaseTestCase.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.testing; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -104,7 +105,7 @@ public static     void assertContains(Collection coll, A elem) { * @param elem the element that should not be in the collection */ public static void assertNotContains(Collection coll, A elem) { - Asserts.assertNotContains(coll, elem); + assertFalse(coll.contains(elem)); } /** From 5ea3dce5a8ad5763281b0427cc96c9090d746803 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Mon, 7 Aug 2023 14:59:15 +0200 Subject: [PATCH 123/127] use full path for sudo --- java/code/src/com/suse/cloud/CloudPaygManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/code/src/com/suse/cloud/CloudPaygManager.java b/java/code/src/com/suse/cloud/CloudPaygManager.java index 094d953e1fe1..0569f6ce8615 100644 --- a/java/code/src/com/suse/cloud/CloudPaygManager.java +++ b/java/code/src/com/suse/cloud/CloudPaygManager.java @@ -116,7 +116,7 @@ protected boolean isFileExecutable(String filename) { */ protected String getInstanceType() throws ExecutionException { try { - Process proc = Runtime.getRuntime().exec("sudo /usr/bin/instance-flavor-check"); + Process proc = Runtime.getRuntime().exec("/usr/bin/sudo /usr/bin/instance-flavor-check"); proc.waitFor(); try (InputStream inputStream = proc.getInputStream()) { From fb956db382b58a89ff41afb7894024c8d3f92fc1 Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Wed, 9 Aug 2023 11:11:04 +0200 Subject: [PATCH 124/127] Fixed handling of null credentials --- .../src/com/redhat/rhn/manager/content/ContentSyncManager.java | 3 ++- ...ewalk-java.changes.mackdk.4.3-fix-null-credentials-handling | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java index c8179742752c..aa273e1bd7f0 100644 --- a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java +++ b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java @@ -1666,7 +1666,8 @@ private List loadStaticTree(String tag) throws ContentSyncExce } // If we have only RMT credentials - if (!credentials.isEmpty() && credentials.stream().allMatch(c -> c.isTypeOf(Credentials.TYPE_CLOUD_RMT))) { + if (!credentials.isEmpty() && + credentials.stream().allMatch(c -> c != null && c.isTypeOf(Credentials.TYPE_CLOUD_RMT))) { // Remove Ubuntu and Debian products until RMT supports them tree.removeIf(productEntry -> productEntry.getChannelLabel().contains("amd64") || productEntry.getParentChannelLabel().filter(label -> label.contains("amd64")).isPresent()); diff --git a/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling b/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling new file mode 100644 index 000000000000..159d0bb4da3f --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.4.3-fix-null-credentials-handling @@ -0,0 +1 @@ +- Fixed handling of null credentials in RMT credentials check From fc8093776afa3bf2d31a93ed6df8d599d1745246 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Thu, 10 Aug 2023 11:50:18 +0200 Subject: [PATCH 125/127] QE: Create step for database backup (#7399) Since the switch from SLES to openSUSE Leap 15.4, we sync much more packages, which results in a bigger database. Moving from the default timeout of 250 s to 600 s in a new step for the database backup, could help solve failing in the finishing stage of our test suite. --- testsuite/features/finishing/srv_smdba.feature | 6 +++--- testsuite/features/step_definitions/smdba_steps.rb | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/testsuite/features/finishing/srv_smdba.feature b/testsuite/features/finishing/srv_smdba.feature index 427d733a7790..1bc01c6f2b7d 100644 --- a/testsuite/features/finishing/srv_smdba.feature +++ b/testsuite/features/finishing/srv_smdba.feature @@ -58,11 +58,11 @@ Feature: SMDBA database helper tool Given a postgresql database is running And there is no such "/smdba-backup-test" directory When I create backup directory "/smdba-backup-test" with UID "root" and GID "root" - And I issue command "smdba backup-hot --enable=on --backup-dir=/smdba-backup-test" + And I take a backup with smdba in folder "/smdba-backup-test" Then I should see error message that asks "/smdba-backup-test" belong to the same UID/GID as "/var/lib/pgsql/data" directory And I remove backup directory "/smdba-backup-test" When I create backup directory "/smdba-backup-test" with UID "postgres" and GID "postgres" - And I issue command "smdba backup-hot --enable=on --backup-dir=/smdba-backup-test" + And I take a backup with smdba in folder "/smdba-backup-test" Then I should see error message that asks "/smdba-backup-test" has same permissions as "/var/lib/pgsql/data" directory And I remove backup directory "/smdba-backup-test" @@ -71,7 +71,7 @@ Feature: SMDBA database helper tool And there is no such "/smdba-backup-test" directory When I create backup directory "/smdba-backup-test" with UID "postgres" and GID "postgres" And I change Access Control List on "/smdba-backup-test" directory to "0700" - And I issue command "smdba backup-hot --enable=on --backup-dir=/smdba-backup-test" + And I take a backup with smdba in folder "/smdba-backup-test" Then base backup is taken And in "/smdba-backup-test" directory there is "base.tar.gz" file and at least one backup checkpoint file And parameter "archive_command" in the configuration file "/var/lib/pgsql/data/postgresql.conf" is "/usr/bin/smdba-pgarchive" diff --git a/testsuite/features/step_definitions/smdba_steps.rb b/testsuite/features/step_definitions/smdba_steps.rb index 05d45ef6fe5c..0061fa5f4fac 100644 --- a/testsuite/features/step_definitions/smdba_steps.rb +++ b/testsuite/features/step_definitions/smdba_steps.rb @@ -122,6 +122,11 @@ log "\n*** Taking backup, this might take a while ***\n" end +Then(/^I take a backup with smdba in folder "(.*?)"$/) do |backup_dir| + command = "smdba backup-hot --enable=on --backup-dir=#{backup_dir}" + $output, _code = get_target('server').run(command, timeout: 600, check_errors: true) +end + Then(/^base backup is taken$/) do assert_includes($output, 'Finished') end From 014743c449205f5d9d94f4b1e8a49b2742fe9b10 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Thu, 10 Aug 2023 15:45:42 +0200 Subject: [PATCH 126/127] CI: exit if yarn errors Signed-off-by: Jordi Massaguer Pla --- testsuite/podman_runner/08_build_server_code.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/podman_runner/08_build_server_code.sh b/testsuite/podman_runner/08_build_server_code.sh index ace82a41e6b6..121c619a8e41 100755 --- a/testsuite/podman_runner/08_build_server_code.sh +++ b/testsuite/podman_runner/08_build_server_code.sh @@ -2,7 +2,7 @@ set -xe sudo -i podman exec uyuni-server-all-in-one-test bash -c "cp /testsuite/podman_runner/debug_logging.properties /etc/tomcat/logging.properties" sudo -i podman exec uyuni-server-all-in-one-test bash -c "cd /java && ant -f manager-build.xml ivy refresh-branding-jar deploy-local" -sudo -i podman exec uyuni-server-all-in-one-test bash -c "cd /web/html/src;[ -d dist ] || mkdir dist;yarn install --force --ignore-optional --production=true --frozen-lockfile;yarn autoclean --force;yarn build:novalidate; rsync -a dist/ /srv/www/htdocs/" +sudo -i podman exec uyuni-server-all-in-one-test bash -c "set -xe;cd /web/html/src;[ -d dist ] || mkdir dist;yarn install --force --ignore-optional --production=true --frozen-lockfile;yarn autoclean --force;yarn build:novalidate; rsync -a dist/ /srv/www/htdocs/" sudo -i podman exec uyuni-server-all-in-one-test bash -c "rctomcat restart" From 0fb958dcfc6ea6316a8a00ef9397ca142999439b Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Thu, 10 Aug 2023 18:05:25 +0200 Subject: [PATCH 127/127] CI: force yarn to use ipv4 address Signed-off-by: Jordi Massaguer Pla --- testsuite/podman_runner/06_start_server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/podman_runner/06_start_server.sh b/testsuite/podman_runner/06_start_server.sh index c602972a1305..a79a5fef823b 100755 --- a/testsuite/podman_runner/06_start_server.sh +++ b/testsuite/podman_runner/06_start_server.sh @@ -2,5 +2,5 @@ set -xe src_dir=$(cd $(dirname "$0")/../.. && pwd -P) -sudo -i podman run --rm --tmpfs /run -v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade -v${src_dir}/testsuite:/testsuite -v ${src_dir}/schema/spacewalk/upgrade/:/etc/sysconfig/rhn/schema-upgrade/ -v ${src_dir}/schema/reportdb/upgrade/:/etc/sysconfig/rhn/reportdb-schema-upgrade/ -v ${src_dir}/web:/web -v ${src_dir}/branding:/branding -v ${src_dir}/java:/java -v /sys/fs/cgroup:/sys/fs/cgroup:rw -v /tmp/test-all-in-one:/tmp --cgroupns=host --add-host=download.opensuse.org:195.135.221.134 -h uyuni-server-all-in-one-test -p 8443:443 -p 8080:80 -p 4505:4505 -p 4506:4506 -d --name=uyuni-server-all-in-one-test --network uyuni-network-1 ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION +sudo -i podman run --rm --tmpfs /run -v ${src_dir}/schema/spacewalk/spacewalk-schema-upgrade:/usr/bin/spacewalk-schema-upgrade -v${src_dir}/testsuite:/testsuite -v ${src_dir}/schema/spacewalk/upgrade/:/etc/sysconfig/rhn/schema-upgrade/ -v ${src_dir}/schema/reportdb/upgrade/:/etc/sysconfig/rhn/reportdb-schema-upgrade/ -v ${src_dir}/web:/web -v ${src_dir}/branding:/branding -v ${src_dir}/java:/java -v /sys/fs/cgroup:/sys/fs/cgroup:rw -v /tmp/test-all-in-one:/tmp --cgroupns=host --add-host=download.opensuse.org:195.135.221.134 --add-host=registry.npmjs.org:104.16.31.34 --add-host=registry.yarnpkg.com:104.16.29.34 -h uyuni-server-all-in-one-test -p 8443:443 -p 8080:80 -p 4505:4505 -p 4506:4506 -d --name=uyuni-server-all-in-one-test --network uyuni-network-1 ghcr.io/$UYUNI_PROJECT/uyuni/ci-test-server-all-in-one-dev:$UYUNI_VERSION