diff --git a/bin/manjaro-architect.in b/bin/manjaro-architect.in index 6641412..2fa936c 100644 --- a/bin/manjaro-architect.in +++ b/bin/manjaro-architect.in @@ -63,7 +63,7 @@ NW_CMD="" # command to launch the available network client HIGHLIGHT=0 # Highlight items for Main Menu HIGHLIGHT_SUB=0 # Highlight items for submenus SUB_MENU="" # Submenu to be highlighted -PARENT"" # the parent menu +PARENT="" # the parent menu # Logical Volume Management LVM=0 # Logical Volume Management Detected? diff --git a/data/translations/danish.trans b/data/translations/danish.trans index f07dcea..99569fd 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -217,7 +217,10 @@ _PartErrBody="\nBIOS systemer kræver mindst en partition (ROOT).\n\nUEFI system # File System _FSTitle="Vælg Filsystem" _FSBody="\nExt4 anbefales. Ikke alle filsystemer er brugbare til Root eller Boot partitioner. Alle har forskellige fordele og ulemper." -_FSSkip="Spring over / Ingen" +_FSSkip="Spring over / Ingen" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Select Root _SelRootBody="\nVælg ROOT Partition. Dette er hvor Manjaro installeres." diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index f8104f2..6f6f717 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -217,7 +217,10 @@ _PartErrBody="\nDe installatie van BIOS systemen vereist minimum één partitie # Bestand Systeem _FSTitle="Kies een bestandsysteem" _FSBody="\nExt4 is hier aanbevolen. Niet alle bestandsystemen zijn geschikt voor de Root of Boot-Partities. Elk bestandsysteem heeft verschillende eigenschappen en beperkingen." -_FSSkip="Sla over / Geen" +_FSSkip="Sla over / Geen" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Selecteer Root _SelRootBody="\nSelecteer de ROOT Partitie. Dit is waar Manjaro zal worden geïnstalleerd." diff --git a/data/translations/english.trans b/data/translations/english.trans index d84b23e..92d9a27 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -216,7 +216,10 @@ _PartErrBody="\nBIOS systems require a minmum of one partition (ROOT).\n\nUEFI s # File System _FSTitle="Choose Filesystem" _FSBody="\nExt4 is recommended. Not all filesystems are viable for Root or Boot partitions. All have different features and limitations." -_FSSkip="Skip / None" +_FSSkip="Skip / None" +_FSMount="Mount" +_FSWarn1="Data on" +_FSWarn2="will be lost!" # Select Root _SelRootBody="\nSelect ROOT Partition. This is where Manjaro will be installed." diff --git a/data/translations/french.trans b/data/translations/french.trans index 0096457..c8cf79c 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -218,7 +218,10 @@ _PartErrBody="\nLes systèmes BIOS requièrent une partition minimum (ROOT).\n\n # Système de fichiers _FSTitle="Choisir un système de fichiers" _FSBody="\nExt4 est recommandé. Tous les systèmes de fichiers ne sont pas exploitables pour les partitions racine ou pour les partitions de démarrage. Tous ont des caractéristiques différentes et des restrictions." -_FSSkip="Passer / Aucun" +_FSSkip="Passer / Aucun" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Sélectionner Root _SelRootBody="\nSélectionner la partition racine (ROOT) où Manjaro sera installé." diff --git a/data/translations/german.trans b/data/translations/german.trans index 55bd522..1122a0e 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -216,7 +216,10 @@ _PartErrBody="\nBIOS systems require a minmum of one partition (ROOT).\n\nUEFI s # File System _FSTitle="Choose Filesystem" _FSBody="\nExt4 is recommended. Not all filesystems are viable for Root or Boot partitions. All have different features and limitations." -_FSSkip="Skip / None" +_FSSkip="Skip / None" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Select Root _SelRootBody="\nSelect ROOT Partition. This is where Manjaro will be installed." diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index b548227..ad6e33c 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -217,7 +217,10 @@ _PartErrBody="\nBIOS rendszereknél a minimális követelmény egy partíció (R # Fájlrendszer _FSTitle="Válassz fájlrendszert" _FSBody="\nExt4 az ajánlott. Nem minden fájlrendszer alkalmas Root vagy Boot partíció számára. A fájrendszerek különböző funkciókat és korlátokat tartalmaznak." -_FSSkip="Kihagyás / egyik sem" +_FSSkip="Kihagyás / egyik sem" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Gyökérpartíció (ROOT) kiválasztása _SelRootBody="\nVálassz gyökérpartíciót (ROOT). Ez lesz ahová az Archot telepítjük." diff --git a/data/translations/italian.trans b/data/translations/italian.trans index b4a3122..62ed832 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -217,7 +217,10 @@ _PartErrBody="\nI sistemi BIOS richiedono almeno una partizione (ROOT).\n\nI sis # File System _FSTitle="Selezione Filesystem" _FSBody="\nExt4 è la scelta consigliata. Non tutti i filesystem sono utilizzabili per la partizione di Root o quella di Boot. Ciascuno dispone di funzionalità e limitazioni differenti." -_FSSkip="Salta / Nessuno" +_FSSkip="Salta / Nessuno" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Select Root _SelRootBody="\nSelezionare partizione ROOT. Manjaro sarà installata qui." diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index 0364a71..04dfc0b 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -217,7 +217,10 @@ _PartErrBody="\nSistemas BIOS requerem pelo menos uma partição (ROOT).\n\nSist # Sistema de Arquivos _FSTitle="Escolha o Sistema de Arquivo" _FSBody="\nExt4 é recomendado. Nem todos os sistemas de arquivos são viáveis para partições Root ou Boot. Todas tem diferentes funcionalidades e limitações." -_FSSkip="Saltar/ Nenhum" +_FSSkip="Saltar/ Nenhum" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Seleccionar Root _SelRootBody="\nSeleccione a partição ROOT. Este é o lugar onde Manjaro será instalado." diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 215723a..f2861da 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -217,7 +217,10 @@ _PartErrBody="\nSistemas BIOS requerem pelo menos uma partição (ROOT).\n\nSist # Sistema de Arquivos _FSTitle="Escolha o sistema de arquivo" _FSBody="\nExt4 é recomendado. Nem todos os sistemas de arquivos são viáveis para partições Root ou Boot. Todas tem diferentes funcionalidades e limitações." -_FSSkip="Pular / Nenhum" +_FSSkip="Pular / Nenhum" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Selecionar Root _SelRootBody="\nSelecione a partição ROOT. Este é o lugar onde Manjaro será instalado." diff --git a/data/translations/russian.trans b/data/translations/russian.trans index 4575fac..7f47c0d 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -217,7 +217,10 @@ _PartErrBody="\nBIOS системы требуют как минимум оди # File System _FSTitle="Выберите файловую систему" _FSBody="\nРекомендуется использовать Ext4. Не все файловые системы подходят для Root или Boot разделов. Все имеют различные функции и ограничения." -_FSSkip="Пропустить / Ничего" +_FSSkip="Пропустить / Ничего" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Select Root _SelRootBody="\nВыберите ROOT раздел. Это тот раздел куда будет устанавливаться Manjaro." diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index 9f400cd..82e957c 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -217,7 +217,10 @@ _PartErrBody="\nLos sistemas BIOS requieren un mínimo de una partición (RAÍZ) # Sistema de archivos _FSTitle="Elegir sistema de archivos" _FSBody="\nSe recomienda el sistema de archivos Ext4. No todos los sistemas de archivos son adecuados para particiones raíz o de arranque. Todas tienen sus características y limitaciones." -_FSSkip="Saltar / Ninguno" +_FSSkip="Saltar / Ninguno" +_FSMount="Mount" # translate me ! +_FSWarn1="Data on" # translate me ! +_FSWarn2="will be lost!" # translate me ! # Seleccionar raíz _SelRootBody="\nSeleccione la partición RAÍZ. Aquí es donde se instalará Manjaro." diff --git a/lib/util-disk.sh b/lib/util-disk.sh index 807895b..b3062ec 100644 --- a/lib/util-disk.sh +++ b/lib/util-disk.sh @@ -247,7 +247,7 @@ select_filesystem() { # Warn about formatting! if [[ $FILESYSTEM != $_FSSkip ]]; then - DIALOG " $_FSTitle " --yesno "\n$FILESYSTEM $PARTITION\n\n" 0 0 + DIALOG " $_FSTitle " --yesno "\n$_FSMount $FILESYSTEM\n\n! $_FSWarn1 $PARTITION $_FSWarn2 !\n\n" 0 0 if [[ $? -eq 0 ]]; then ${FILESYSTEM} ${PARTITION} >/dev/null 2>/tmp/.errlog check_for_error