diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 5490ce0..4753ced 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -256,6 +256,7 @@ _ExtPartBody1="\nAngiv partitionens placering. Skal begynde med skråstreg (/). _ExtErrBody="\nPartitionen kan ikke monteres - kontroller navnet. Der skal angives navn efter skråstregen (/).\n\n" # Install Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Installer Base" _InstBseBody="\nStandard: anbefalet for uerfarne. Vælg op til to kerner (linux and linux-lts) og om nødvendigt pakke-gruppen base-devel. Programmerne sudo, btrfs-progs, f2fs-tools installeres også.\n\nAvanceret: Vælg op til fire kerner (linux, lts, grsec, zen) og udvælg individuelle pakker fra base/base-devev gruppen. Yderligere opsætning af grsec og zen kan være nødvendig for Virtualbox and NVIDIA.\n\nBEMÆRK: Med untagelse af allerede installerede kerner, skal mindst en kerne vælges." _InstStandBseBody="\nPakke-gruppen base installeres automatisk. Pakke-gruppen base-devel er nødvendig hvis det er hensigten at anvende Arch User Repository (AUR) .\n\n" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index 78cee9a..24c3953 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -255,6 +255,7 @@ _ExtPartBody1="\nBepaal een partitie aankoppelpunt. Verzeker je ervan dat de naa _ExtErrBody="\nPartitie kan niet worden aangekoppeld wegens een probleem met de aankoppelnaam. De naam moet achter een voorwaartse slash komen.\n\n" # Installeer Basissysteem +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Installeer Basissysteem" _InstBseBody="\nStandaard: Aanbevolen voor beginners. Keuze tot twee kernels (linux en linux-lts) en optioneel kunnen de base-devel pakket groep. sudo, btrfs-progs, f2fs-tools ook worden geïnstalleerd.\n\nGevorderden: Keuze tot vier kernels (linux, lts, grsec, zen) en controle over individuele base en base-devel pakketten. Bijkomende configuratie van vgrsec en zen kan nodig zijn voor Virtualbox en NVIDIA.\n\nNOTE: Tenzij er reeds een kernel geïnstalleerd is, moet er tenminste een kernel worden geselecteerd." _InstStandBseBody="\nDe base package group zal automatisch worden geïnstalleerd. The base-devel package group is nodig voor de Arch User Repository (AUR).\n\n" diff --git a/data/translations/english.trans b/data/translations/english.trans index 2450f86..16c4cd3 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -254,6 +254,7 @@ _ExtPartBody1="\nSpecify partition mountpoint. Ensure the name begins with a for _ExtErrBody="\nPartition cannot be mounted due to a problem with the mountpoint name. A name must be given after a forward slash.\n\n" # Install Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" _InstBseTitle="Install Base" _InstBseBody="\nStandard: Recommended for beginners. Choose up to two kernels (linux and linux-lts) and optionally the base-devel package group. sudo, btrfs-progs, f2fs-tools will also be installed.\n\nAdvanced: Choose up to four kernels (linux, lts, grsec, zen) and control individual base and base-devel packages. Additional configuration for grsec and zen may be required for Virtualbox and NVIDIA.\n\nNOTE: Unless already installed, at least one kernel must be selected." _InstStandBseBody="\nThe base package group will be installed automatically. The base-devel package group is required to use the Arch User Repository (AUR).\n\n" @@ -379,7 +380,7 @@ _InstGrMenuDM="Install Display Manager" # Networking Menu _InstNMMenuTitle="Install Networking Capabilties" _InstNWDrv="Install Network Drivers" -_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything." +_InfoNWKernel="Support for your network card is built into the kernel,\nno need to install anything." _InstNMMenuBody="\nSupplementary packages may be required for networking and wireless devices. Some wireless devices may also require additional firmware to function.\n\n" _InstNMMenuPkg="Install Wireless Device Packages" _InstNMMenuNM="Install Network Connection Manager" diff --git a/data/translations/french.trans b/data/translations/french.trans index 32edadb..5b7b4e5 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -256,6 +256,7 @@ _ExtPartBody1="\nSpécifier le point de montage de la partition. Assurez-vous qu _ExtErrBody="\nLa partition ne peut être montée, cela est dû à un problème avec le nom du point de montage. Un nom doit être déterminé après la barre oblique.\n\n" # Installer Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Installer la Base" _InstBseBody="\nStandard : Recommandé pour les débutants. Choix entre 2 noyaux (linux et linux-lts) et choix optionnel du groupe de paquets 'base-devel'. sudo, btrfs-progs, f2fs-tools seront également installés.\n\nAvancé : Choix entre 4 noyaux (linux, lts, grsec, zen) et contrôle individuel des paquets de 'base' et 'base-devel'. Une configuration additionnelle de grsec et zen peut être requise pour NVIDIA et Virtualbox.\n\nNOTE : Sauf si déjà installé, au moins un noyau doit être sélectionné." _InstStandBseBody="\nLe groupe de paquets 'base' va être installé automatiquement. Le groupe de paquets 'base-devel' est nécessaire afin d'utiliser le dépôt AUR (Arch User Repository ).\n\n" diff --git a/data/translations/german.trans b/data/translations/german.trans index 71e4010..e4fe5e7 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -254,6 +254,7 @@ _ExtPartBody1="\nSpecify partition mountpoint. Ensure the name begins with a for _ExtErrBody="\nPartition cannot be mounted due to a problem with the mountpoint name. A name must be given after a forward slash.\n\n" # Install Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Install Base" _InstBseBody="\nStandard: Recommended for beginners. Choose up to two kernels (linux and linux-lts) and optionally the base-devel package group. sudo, btrfs-progs, f2fs-tools will also be installed.\n\nAdvanced: Choose up to four kernels (linux, lts, grsec, zen) and control individual base and base-devel packages. Additional configuration for grsec and zen may be required for Virtualbox and NVIDIA.\n\nNOTE: Unless already installed, at least one kernel must be selected." _InstStandBseBody="\nThe base package group will be installed automatically. The base-devel package group is required to use the Arch User Repository (AUR).\n\n" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index b6fe709..1a879cf 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -250,6 +250,7 @@ _ExtPartBody1="\nAdj meg partíció csatolási pontot. Figyelj arra, hogy a név _ExtErrBody="\nA partíció nem csatolható a csatolási pont nevének hibája miatt. A nevet per (/) jel után add meg.\n\n" # Alaprendszer telepítése +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Alaprendszer telepítése" _InstBseBody="\nNormál: a kezdőknek ajánlott. Válassz maximum két kernelt (linux and linux-lts). A 'base-devel' csomagcsoport opcionális. A 'sudo’, ‘btrfs-progs’, ‘f2fs-tools' csomagok is telepítve lesznek.\n\nHaladó: Válassz ki legfeljebb négy kernelt (linux, lts, grsec, zen) és egyedi 'base' és 'base-devel' csomagokat. A 'grsec' és 'zen' kerneleknél további konfigurációra lehet szükség a 'Virtualbox' és NVIDIA használatához.\n\nMegjegyzés: Ha nincs még kernel telepítve, akkor legalább egy kernelt választanod kell." _InstStandBseBody="\nA telepítő a következő lépésben a telepíteni fogja az alapcsomagokat. A 'base-devel' csomagcsoport az Arch User Repository (AUR) használatához szükséges.\n\n" diff --git a/data/translations/italian.trans b/data/translations/italian.trans index ef40437..b775ea4 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -255,6 +255,7 @@ _ExtPartBody1="\nSpecificare mountpoint partizione. Assicurarsi che il nome comi _ExtErrBody="\nImpossibile montare la partizione a case di un problema con il nome mountpoint. Deve essere indicato un nome dopo lo slash.\n\n" # Install Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Installazione di base" _InstBseBody="\nStandard: Raccomandata per i principianti. Scegliere fino a due kernels (linux and linux-lts) e volendo il gruppo pacchetti base-devel. In aggiunta, verranno installati sudo, btrfs-progs, f2fs-tools.\n\nAvanzato: Selezionare fino a 4 kernels (linux, lts, grsec, zen) e controllare pacchetti base e base-devel individualmente. Potrebbe essere richiesta configurazione aggiuntiva con grsec e zen per Virtualbox e NVIDIA.\n\nNOTA: a meno di installazioni precedenti, è necessario selezionare almeno un kernel." _InstStandBseBody="\nIl gruppo di pacchetti base verrà installato automaticamente. Il gruppo di pacchetti base-devel è richiesto per utilizzare l'Arch User Repository (AUR).\n\n" diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index 5a813aa..0ce460f 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -254,6 +254,7 @@ _ExtPartBody1="\nEspecifique o ponto de montagem da partição. Verifique se o n _ExtErrBody="\nA partição não pode ser montada devido a um problema com o nome do ponto de montagem. Um nome deve ser dado depois da barra.\n\n" # Instalar Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Instalar Base" _InstBseBody="\nPadrão: Recomendado para iniciantes. Escolha até dois kernels (linux e linux-lts) e opcionalmente o grupo de pacotes base-devel. O sudo, btrfs-progs, f2fs-tools também serão instalados.\n\nAvançado: Escolha até quatro kernels (linux, lts, grsec, zen) e controle individualmente os pacotes base e base-devel. O Virtualbox e a NVIDIA podem precisar de configuração adicional com o grsec e zen.\n\nNOTA: Ao menos que já instalado, um kernel deve ser seleccionado." _InstStandBseBody="\nO grupo pacote básico será instalado automaticamente. O grupo pacote base-devel é necessário para usar o repositório do usuário Manjaro (AUR).\n\n" diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 52b14bd..ccd2f04 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -255,6 +255,7 @@ _ExtPartBody1="\nEspecifique o ponto de montagem da partição. Certifique-se qu _ExtErrBody="\nA partição não pode ser montada devido a um problema com o nome do ponto de montagem. Um nome deve ser dado depois da barra.\n\n" # Instalar Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Instalar Base" _InstBseBody="\nPadrão: Recomendado para iniciantes. Escolha até dois kernels (linux e linux-lts) e opcionalmente o grupo de pacotes base-devel. O sudo, btrfs-progs, f2fs-tools também serão instalados.\n\nAvançada: Escolha até quatro kernels (linux, lts, grsec, zen) e controle individualmente os pacotes base e base-devel. O Virtualbox e a NVIDIA podem precisar de configuração adicional com o grsec e zen.\n\nNOTA: Ao menos que já instalado, um kernel deve ser selecionado." _InstStandBseBody="\nO grupo de pacote base será instalado automaticamente. The base package group will be installed automatically. O grupo de pacote base-devel é necessário para utilizar o AUR (Arch User Repository).\n\n" diff --git a/data/translations/russian.trans b/data/translations/russian.trans index b7f8f40..cea0ddd 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -255,6 +255,7 @@ _ExtPartBody1="\nУкажите точку монтирования. Убеди _ExtErrBody="\nРаздел не может быть смонтирован из-за проблем с именем точки монтирования. Имя должно быть введено после косой черты.\n\n" # Install Base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Установка базовой системы" _InstBseBody="\nСтандартная: Рекомендуется для новичов. Выберите до двух ядер (linux и linux-lts) и опциональную группу пакетов base-devel. Пакеты sudo, btrfs-progs, f2fs-tools также будут установлены.\n\nРасширенная: Выберите до четырех ядер (linux, lts, grsec, zen) и индивидуально настройте пакеты base и base-devel. Дополнительная настройка grsec и zen может быть необходимой для Virtualbox и NVIDIA.\n\nПРИМЕЧАНИЕ: Необходимо выбрать как минимум одно ядро, если оно еще не установлено." _InstStandBseBody="\nГруппа пакетов base будет установлена автоматически. Группа пакетов base-devel требуется для использования Arch User Repository (AUR).\n\n" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index f7b7661..5e3d595 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -255,6 +255,7 @@ _ExtPartBody1="\nPunto de montaje de partición específica. Asegúrese de que e _ExtErrBody="\nLa partición no se puede montar debido a un problema con el nombre del punto de montaje. Se debe indicar un nombre después de una barra inclinada (/).\n\n" # Instalar sistema base +_WarnInstBase="A Manjaro Base has already been installed on this partition.\nProceed anyway?" # translate me ! _InstBseTitle="Instalar sistema base" _InstBseBody="\nEstándar: Recomendado para principiantes. Elija hasta dos núcleos (linux y linux-lts) y opcionalmente el grupo de paquetes 'base-devel'. También se instalará sudo, btrfs-progs y f2fs-tools.\n\nAvanzado: Elija hasta cuatro núcleos (linux, lts, grsec, zen) y controle de forma individual los paquetes de 'base' y 'base-devel'. VirtualBox y NVIDIA pueden requerir configuración adicional con grsec y zen.\n\nNOTA: A menos que ya esté instalado, se necesita seleccionar al menos un núcleo." _InstStandBseBody="\nSe instalará de forma automática el grupo de paquetes 'base'. El grupo de paquetes 'base-devel' es necesario para poder usar el Arch User Repository (AUR).\n\n" diff --git a/lib/util-base.sh b/lib/util-base.sh index 6c8549d..7ad3bfe 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -209,6 +209,9 @@ filter_packages() { } install_base() { + if [[ -e /mnt/.base_installed ]]; then + DIALOG " $_InstBseTitle " --yesno "\n\n$_WarnInstBase\n\n" 0 0 && rm /mnt/.base_installed || return 0 + fi # Prep variables setup_profiles echo "" > ${PACKAGES} @@ -218,7 +221,6 @@ install_base() { KERNEL="n" mhwd-kernel -l | awk '/linux/ {print $2}' > /tmp/.available_kernels kernels=$(cat /tmp/.available_kernels) - [[ -e /mnt/.base_installed ]] && rm /mnt/.base_installed # User to select initsystem DIALOG " $_ChsInit " --menu "\n$_WarnOrc\n" 0 0 2 \ diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh index c0cd5e2..22494f5 100644 --- a/lib/util-desktop.sh +++ b/lib/util-desktop.sh @@ -38,7 +38,7 @@ setup_graphics_card() { setup_network_drivers() { if [[ $(mhwd -l | awk '/network-/' | wc -l) -eq 0 ]]; then - DIALOG " $_InstNWDrv " --msgbox "$_InfoNWKernel" 0 0 + DIALOG " $_InstNWDrv " --msgbox "\n\n$_InfoNWKernel\n\n" 0 0 else DIALOG " $_InstGrDrv " --radiolist "\n$_UseSpaceBar" 0 0 12 \ $(mhwd -l | awk '/network-/{print $1}' |awk '$0=$0" - off"') 2> /tmp/.network_driver || return 0