diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 86ceff1..16c5646 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -363,6 +363,7 @@ _InstDEMenuTitle="Vælg en komplet Manjaro udgave eller et skrivebords miljø ud _InstGrMenuDS="Installer Display Server" _InstGrMenuDSBody="I tillæg til xorg og wayland muligheder, er drivere til input enheder (xf86-input-) også medtaget." _InstGrMenuDD="Installer Display Driver" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Installer Manjaro Skrivebord (stabile profiler)" _InstDEGit="Installer Manjaro Skrivebord (udviklings profiler)" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index e3f6caf..de0009e 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Installeer Weergave Manager" _InstGrMenuDSBody="In aanvulling op Xorg en Wayland opties, zijn stuurprogramma's voor invoerapparaten (xf86-input) ook vermeld." _InstGrMenuDD="Installeer Weergave Manager" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! diff --git a/data/translations/english.trans b/data/translations/english.trans index 23e3588..cebe9f2 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Install Display Server" _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed." _InstGrMenuDD="Install Display Driver" +_InstGrDrv="Choose video-driver to be installed" _WarnInstGr="No Display Driver selected." _InstDEStable="Install Manjaro Desktop (stable profiles)" _InstDEGit="Install Manjaro Desktop (development profiles)" diff --git a/data/translations/french.trans b/data/translations/french.trans index 1184c15..f7954f6 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -363,6 +363,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Installer le serveur d'affichage" _InstGrMenuDSBody="En complément des options xorg et wayland, les pilotes pour les périphériques d'entrée (xf86-input-) sont également référencés." _InstGrMenuDD="Installer le pilote d'affichage" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Installer bureau Manjaro (profils stable)" _InstDEGit="Installer bureau Manjaro (profils de développement)" diff --git a/data/translations/german.trans b/data/translations/german.trans index 4f75f8c..ba58efb 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Install Display Server" _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed." _InstGrMenuDD="Install Display Driver" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" _InstDEGit="Install Manjaro Desktop (development profiles)" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index e9b3c4e..cc66308 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="X szerver telepítése" _InstGrMenuDSBody="A 'xorg' és 'wayland' lehetőségek mellett , a beviteli eszközök illesztőprogramjai (xf86-input-) is szerepelnek a listán." _InstGrMenuDD="Megjelenítő meghajtóprogramok telepítése" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! diff --git a/data/translations/italian.trans b/data/translations/italian.trans index ed028b3..5582a22 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -362,11 +362,12 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Installa Display Server" _InstGrMenuDSBody="In aggiunta alle opzioni xorg e wayland, vengono mostrati drivers per dispositivi di input (xf86-input-)." _InstGrMenuDD="Installazione Display Driver" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! _InstGrDE="Install Desktop environment" # translate me! -_InstPBody="This installs a package list and a desktop-settings package, that corresponding to manjaro editions of the same name." # translate me! +_InstPBody="This installs a package list and a desktop-settings package, that corresponding to manjaro editions of the same name." # translate me! _InstDE="Install unconfigured desktop environments" # translate me! _InstGrMenuGE="Installazione Ambiente Grafico" _InstGrMenuDM="Installazione Display Manager" diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index e553e14..856aebf 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Instalar Servidor de Exibição" _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-) também são listados." _InstGrMenuDD="Instalar Driver de Vídeo" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 74b6ff8..11f25fa 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Instalar servidor de exibição" _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-*) são fornecidos." _InstGrMenuDD="Instalar driver de vídeo" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! diff --git a/data/translations/russian.trans b/data/translations/russian.trans index c725955..372fe9e 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Установка оконного сервера" _InstGrMenuDSBody="В дополнение к xorg и wayland, в список включены драйвера для устройств ввода (xf86-input-)." _InstGrMenuDD="Установка графического драйвера" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Установить рабочий стол Манджаро (стабильные профили)" _InstDEGit="Установить рабочий стол Манджаро (профили в разработке)" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index bb25b6b..e0e8548 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments" _InstGrMenuDS="Instalar servidor de pantalla" _InstGrMenuDSBody="Además de las opciones 'xorg' y 'wayland', también se proporcionan drivers para dispositivos de entrada (xf86-input)." _InstGrMenuDD="Instalar driver de pantalla" +_InstGrDrv="Choose video-driver to be installed" # translate me! _WarnInstGr="No Display Driver selected." # translate me! _InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me! _InstDEGit="Install Manjaro Desktop (development profiles)" # translate me! diff --git a/lib/util-advanced.sh b/lib/util-advanced.sh index 518dbb7..b42806e 100644 --- a/lib/util-advanced.sh +++ b/lib/util-advanced.sh @@ -409,7 +409,7 @@ install_multimedia_menu() { local PARENT="$FUNCNAME" submenu 5 - DIALOG "$_InstMultMenuBody" --default-item ${HIGHLIGHT_SUB} --menu " $_InstMultMenuTitle " 0 0 5 \ + DIALOG " $_InstMultMenuBody " --default-item ${HIGHLIGHT_SUB} --menu " $_InstMultMenuTitle " 0 0 5 \ "1" "$_InstMulSnd" \ "2" "$_InstMulCodec" \ "3" "$_InstMulAcc" \ diff --git a/lib/util-base.sh b/lib/util-base.sh index e54117d..6b73c0c 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -545,7 +545,7 @@ create_new_user() { setup_graphics_card() { # Main menu. Correct option for graphics card should be automatically highlighted. - DIALOG " Choose video-driver to be installed " --radiolist "$_InstDEBody\n\n$_UseSpaceBar" 0 0 12 \ + DIALOG " $_InstGrDrv " --radiolist "$_InstDEBody\n\n$_UseSpaceBar" 0 0 12 \ $(mhwd -l | awk 'FNR>4 {print $1}' | awk 'NF' |awk '$0=$0" - off"') 2> /tmp/.driver || return 0 if [[ $(cat /tmp/.driver) != "" ]]; then diff --git a/lib/util.sh b/lib/util.sh index ceca0c1..f2190da 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -180,7 +180,7 @@ check_for_error() { # Add locale on-the-fly and sets source translation file for installer select_language() { - DIALOG " Select Language" --default-item '3' --menu "\n$_Lang" 0 0 11 \ + DIALOG " Select Language " --default-item '3' --menu "\n$_Lang" 0 0 11 \ "1" $"Danish|(da_DK)" \ "2" $"Dutch|(nl_NL)" \ "3" $"English|(en_**)" \