Archives
/
manjaro-architect
mirror of https://gitlab.manjaro.org/applications/manjaro-architect
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update dialogs

Browse Source
merge-requests/273/head
Bernhard Landauer 7 years ago
parent 12205d10be
commit 3fa4a5c767
12 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File

7
data/translations/danish.trans
Unescape Escape View File

@ -22,11 +22,13 @@ _PassErrBody="Adgangskoderne er ikke ens. Prøv igen."
# Basics
_SelLang="Sprogvalg"
_Lang="Sprog"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Internet forbindelse er ikke aktiv"
_EstCon="Opret forbindelse?"
_Config="Opsæt"
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Security and Tweaks
@ -155,7 +157,6 @@ _MIrrorPacQ="Brug denne opsætning til det færdige system? Hvis ja, vil filen b
# Set Keymap (vconsole)
_VCKeymapTitle="Vælg Terminal Tastatur Layout"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="En Terminal er en kommando prompt i et ikke-grafisk miljø. Tastatur layout er uafhængigt af Skrivebord"
# Set Xkbmap (environment)

17
data/translations/dutch.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Fout"
_PassErrBody="De ingegeven wachtwoorden zijn niet identiek. Probeer opnieuw aub."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Veiligheid en aanpassingen
@ -154,7 +156,6 @@ _MIrrorPacQ="Wil je het aangepast pacman configuratiebestand gebruiken voor het
# Stel het toetsenbord in (vconsole)
_VCKeymapTitle="Stel de Virtuele Console in"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Een virtuele console is een shell prompt in een niet-grafische omgeving. De toetsenbordindeling ervan is onafhankelijk van een desktop suite / terminal."
# stel Xkbmap in (omgeving)

3
data/translations/english.trans
Unescape Escape View File

@ -21,6 +21,8 @@ _PassErrBody="The passwords entered do not match. Please try again."
# Basics
_SelLang="Select Language"
_Lang="Language"
_Keymap="Keymap"
_Change="Would you like to change the settings?"
_NoCon="No Internet Detected."
_EstCon="Establish connection?"
_Config="Configure"
@ -153,7 +155,6 @@ _MIrrorPacQ="Use edited pacman configuration for installed system? If Yes, the f
# Set Keymap (vconsole)
_VCKeymapTitle="Set Virtual Console"
_DefKeymap="The default keymap for your selected language is"
_Change="Change"
_VCKeymapBody="A virtual console is a shell prompt in a non-graphical environment. Its keymap is independent of a desktop environment / terminal."
# Set Xkbmap (environment)

3
data/translations/french.trans
Unescape Escape View File

@ -22,6 +22,8 @@ _PassErrBody="Les mots de passe entrés ne correspondent pas. Veuillez réessaye
# Basics
_SelLang="Choisir la langue"
_Lang="Langue"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Pas de connexion Internet détectée."
_EstCon="Établir la connexion ?"
_Config="Configurer"
@ -155,7 +157,6 @@ _MIrrorPacQ="Utiliser la configuration modifiée de pacman pour le système inst
# Configurer l'agencement du clavier (vconsole)
_VCKeymapTitle="Configurer la console virtuelle"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Une console virtuelle est une invite de commande (shell prompt) dans un environnement non graphique. Son agencement clavier est indépendant du terminal / environnement de bureau."
# Configurer Xkbmap (environnement)

3
data/translations/german.trans
Unescape Escape View File

@ -20,6 +20,8 @@ _PassErrBody="Die eingegebenen Passwörter sind nicht gleich. Bitte erneut versu
# Basics
_SelLang="Sprachauswahl"
_Lang="Sprache"
_Keymap="Tastaturbelegung"
_Change="Möchten Sie die Einstellungen ändern?"
_NoCon="Keine Internetverbindung."
_EstCon="Verbindung herstellen?"
_Config="Konfiguration"
@ -153,7 +155,6 @@ _MIrrorPacQ="Die editierte Pacman-Konfiguration für das installierte System nut
# Set Keymap (vconsole)
_VCKeymapTitle="Konsolensprache einstellen"
_DefKeymap="Die automatisch ausgewählte Tastaturbelegung für Kommandozeilen-Interface ist"
_Change="Ändern"
_VCKeymapBody="Eine virtuelle Konsole ist das Kommandozeilen-Interface einer nicht-graphischen Umgebung.\nIhr Tastaturlayout ist unabhängig von der Desktop-Umgebung."
# Set Xkbmap (environment)

3
data/translations/hungarian.trans
Unescape Escape View File

@ -20,6 +20,8 @@ _PassErrBody="A megadott jelszavak nem egyeznek. Kérlek próbáld újra."
# Alap beállítások
_SelLang="Válassz nyelvet"
_Lang="Nyelv"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Nincs internetkapcsolat."
_EstCon="Kapcsolódni akarsz az internethez?"
_Config="Beállítás"
@ -152,7 +154,6 @@ _MirrorPacQ="Használni akarod a szerkesztett 'pacman' konfigurációt a telepí
# Virtuális konzol billentyűzetkiosztásának beállítása \(vconsole\)
_VCKeymapTitle="Virtuális konzol beállítása"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="A virtuális konzol egy nem grafikus környezetben futó 'shell prompt'. A billentyűzetkiosztása független az asztali környezettől."
# Asztali környezet billentyűzetkioszásának beállítása \(Xkbmap\)

17
data/translations/italian.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Errore"
_PassErrBody="Le password digitate non corrispondono. Provare nuovamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Security and Tweaks
@ -154,7 +156,6 @@ _MIrrorPacQ="Usare la configurazione pacman modificata per il sistema installato
# Impostazione tastiera (vconsole)
_VCKeymapTitle="Imposta Virtual Console"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Una virtual console è un prompt di comando in un ambiente non-grafico. La sua mappatura tastiera è indipendente da quella per l'ambiente desktop / terminale."
# Impostazione Xkbmap (ambiente desktop)

17
data/translations/portuguese.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Erro"
_PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Segurança e Ajustes
@ -153,7 +155,6 @@ _MIrrorPacQ="Utilizar o arquivo de configuração editado do pacman para o siste
# Definir Layout de teclado (vconsole)
_VCKeymapTitle="Definir Console Virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Um console virtual é um prompt do shell em um ambiente não-gráfico. Seu layout de teclado é independente de um ambiente de desktop / terminal."
# Definir Xkbmap (ambiente)

17
data/translations/portuguese_brasil.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Erro"
_PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Segurança e Ajustes
@ -154,7 +156,6 @@ _MIrrorPacQ="Utilizar o arquivo de configuração editado do pacman para o siste
# Definir layout de teclado (vconsole)
_VCKeymapTitle="Definir console virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Um console virtual é um prompt do shell em um ambiente não-gráfico. Seu layout de teclado é independente de um ambiente de desktop / terminal."
# Definir Xkbmap (ambiente)

3
data/translations/russian.trans
Unescape Escape View File

@ -21,6 +21,8 @@ _PassErrBody="Введеные пароли не совпадают. Пожал
# Basics
_SelLang="Выбрать язык"
_Lang="Язык"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Интернет не найден."
_EstCon="Установить соединение?"
_Config="Настроить"
@ -154,7 +156,6 @@ _MIrrorPacQ="Использовать отредактированный кон
# Set Keymap (vconsole)
_VCKeymapTitle="Настройка виртуальной консоли"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Виртуальная консоль представляет собой оболочку командной строки в неграфической среде. Ее раскладка не зависит от среды рабочего стола / терминала."
# Set Xkbmap (environment)

17
data/translations/spanish.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Error"
_PassErrBody="Las contraseñas introducidas no coinciden. Vuelva a intentarlo."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Seguridad y ajustes
@ -154,7 +156,6 @@ _MIrrorPacQ="¿Utilizar el archivo de configuración de 'pacman' editado para el
# Seleccionar distribución de teclado de la consola virtual (vconsole)
_VCKeymapTitle="Seleccionar distribución de teclado de la consola virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_Change="Change" # translate me !
_VCKeymapBody="Una consola virtual es un intérprete de comandos en un entorno no gráfico. Su distribución de teclado es independiente de un entorno de escritorio o terminal."
# Seleccionar Xkbmap (entorno)

6
lib/util.sh
Unescape Escape View File

@ -217,7 +217,7 @@ set_language() {
import $DATADIR/translations/$TRANS.trans
# does user want to change the old settings?
DIALOG " $_SelLang " --yesno "\nLanguage: [ ${TRANS} ]\n Keymap: [ ${KEYMAP} ].\n\n${_Change}?\n " 0 0 && select_language
DIALOG " $_SelLang " --yesno "\n${_Lang}: [ ${TRANS^} ]\n$_Keymap: [ ${KEYMAP} ]\n\n${_Change}?\n " 0 0 && select_language
fi
# Generate locale and set language
@ -235,7 +235,7 @@ set_language() {
setfont $FONT 2>$ERR
check_for_error "set font $FONT" $?
ini system.font "$FONT"
ini linux.font "$FONT"
# store settings for re-use in target install ## to be accomplished via ini in the future
echo -e "KEYMAP=${KEYMAP}\nFONT=${FONT}" > /tmp/vconsole.conf
@ -328,7 +328,7 @@ select_language() {
ini linux.font "$FONT"
# does user want to change the default keymap?
DIALOG " $_VCKeymapTitle " --yesno "\n$_DefKeymap [ ${KEYMAP} ].\n\n${_Change}?\n " 0 0 && select_keymap
DIALOG " $_VCKeymapTitle " --yesno "\n${_DefKeymap}:\n[ ${KEYMAP} ].\n\n${_Change}\n " 0 0 && select_keymap
}
select_keymap() {

Write Preview
Loading…
Cancel
Save