Merge branch 'master' of https://github.com/Chrysostomus/manjaro-architect

7 years ago · c6b3a82324
parent a37cca43b7 1bba9ccab4
commit c6b3a82324
14 changed files with 70 additions and 20 deletions
--- a/data/translations/danish.trans
+++ b/data/translations/danish.trans
@ -477,3 +477,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/dutch.trans
+++ b/data/translations/dutch.trans
@ -474,3 +474,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/english.trans
+++ b/data/translations/english.trans
@ -475,3 +475,7 @@ _AddPkgs="Choose any extra packages you would like to add.
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter."

+#Extra
+_ExtraTitle="Extra packages"
+_ExtraBody="Would you like to add any additional packages to your installation?"
+
--- a/data/translations/french.trans
+++ b/data/translations/french.trans
@ -476,3 +476,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/german.trans
+++ b/data/translations/german.trans
@ -470,3 +470,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/hungarian.trans
+++ b/data/translations/hungarian.trans
@ -475,3 +475,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/italian.trans
+++ b/data/translations/italian.trans
@ -474,3 +474,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/polish.trans
+++ b/data/translations/polish.trans
@ -474,3 +474,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/portuguese.trans
+++ b/data/translations/portuguese.trans
@ -473,3 +473,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/portuguese_brasil.trans
+++ b/data/translations/portuguese_brasil.trans
@ -476,3 +476,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/russian.trans
+++ b/data/translations/russian.trans
@ -1,7 +1,7 @@
 ##
-## 							
-## Russian Translation File (Architect 2.0)		
-##								
+##
+## Russian Translation File (Architect 2.0)
+##
 ##
 ## Written by Carl Duff (27-Feb-2016)
 ##
@ -24,7 +24,7 @@ _PassErrBody="Введеные пароли не совпадают. Пожал
 _SelLang="Выбрать язык"
 _Lang="Язык"
 _Keep="Сохранить"
-_Change="Изменить"                               
+_Change="Изменить"
 _NoCon="Нет подключения к интернету."
 _EstCon="Установить соединение?"
 _Config="Настроить"
@ -200,7 +200,7 @@ _NUsrErrTitle="Имя пользователя - ошибка"
 _NUsrErrBody="Введенное имя пользователя неверно. Пожалуйста, введите еще раз."

 # Set User
-_PassNUsrBody="Введите пароль для" 
+_PassNUsrBody="Введите пароль для"
 _NUsrSetBody="Создание пользователя и присвоение групп..."
 _DefShell="Выберите shell по умолчанию."

@ -444,7 +444,7 @@ _LogInfo="Сохранить журнал установки (installation-log)
 # Chroot
 _ChrootReturn="\nТеперь вы можете зайти в свою установленную систему. Вы можете сделать изменения, почти как если бы вы загрузились с установленной системы.\n\nТип \"exit\" для выхода из chroot и \"fg\" для возврата к установщику.\n "
 _EnterChroot="Введите ваши установки"
-_ChrootTitle="Chroot into installation" # translate me !
+_ChrootTitle="Chroot в установленную систему"

 # rEFInd
 _InstRefindTitle="Установка rEFInd"
@ -466,13 +466,17 @@ _InstCsMenuBody="Устанавливает базовую систему ман
 _MMNewBody="После монтирования разделов в разделе подготовки выберите тип установки. Если вы не уверены, выберите установку настольной системы."

 #System rescue
-_SysRescTitle="System rescue" # translate me !
-_SysRescBody="This menu is collection of tools to help restore broken system to full functionality." # translate me !
-_RmPkgs="Remove packages" # translate me !
-_RmPkgsMsg="Search packages by typing their name.  
-Press tab to select multiple packages" # translate me !
-_RmPkgsPrmpt="Package to remove" # translate me !
-_AddPkgsPrmpt="Package" # translate me !
-_AddPkgs="Choose any extra packages you would like to add. 
-Search packages by typing their name. 
-Press tab to select multiple packages and proceed with Enter." # translate me !
+_SysRescTitle="Восстановление системы"
+_SysRescBody="Это меню является набором инструментов, чтобы помочь восстановить разрушенную систему для полной функциональности."
+_RmPkgs="Удалить пакеты"
+_RmPkgsMsg="Укажите имя пакета для поиска.
+Нажмите Tab, чтобы выбрать несколько пакетов."
+_RmPkgsPrmpt="Пакет для удаления"
+_AddPkgsPrmpt="Пакет"
+_AddPkgs="Выберите любые дополнительные пакеты, которые вы хотите добавить.
+Укажите имя пакета для поиска.
+Нажмите Tab, чтобы выбрать несколько пакетов и нажмите Enter."
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/data/translations/spanish.trans
+++ b/data/translations/spanish.trans
@ -474,3 +474,7 @@ _AddPkgsPrmpt="Package" # translate me !
 _AddPkgs="Choose any extra packages you would like to add. 
 Search packages by typing their name. 
 Press tab to select multiple packages and proceed with Enter." # translate me !
+
+#Extra
+_ExtraTitle="Extra packages" # translate me !
+_ExtraBody="Would you like to add any additional packages to your installation?" # translate me !
--- a/lib/util-desktop.sh
+++ b/lib/util-desktop.sh
@ -437,7 +437,9 @@ choose_mjr_desk() {

        cat $(echo $PROFILES/*/$(cat /tmp/.desktop)/Packages-Desktop) > /mnt/.desktop

-        echo "$(pacman -Ssq) $(pacman -Sg)" | fzf -m -e --header="$_AddPkgs" --prompt="_AddPkgsPrmpt > " --reverse >> /mnt/.desktop
+        DIALOG " $_ExtraTitle " --yesno "\n$_ExtraBody \n " 0 0 && \
+        echo "$(pacman -Ssq) $(pacman -Sg)" | fzf -m -e --header="$_AddPkgs" --prompt="$_AddPkgsPrmpt > " --reverse >> /mnt/.desktop
+    
    fi
 }

--- a/lib/util-menu.sh
+++ b/lib/util-menu.sh
@ -101,7 +101,7 @@ install_core_menu() {
          "4" "$_InstMulCust" \
          "5" "$_SecMenuTitle|>" \
          "6" "$_SeeConfOptTitle" \
-          "7" "Chroot into installation" \
+          "7" "$_ChrootTitle" \
          "8" "$_Back" 2>${ANSWER}
        HIGHLIGHT_SUB=$(cat ${ANSWER})

@ -141,7 +141,7 @@ install_desktop_system_menu() {
          "3" "$_ConfBseMenuTitle" \
          "4" "$_SecMenuTitle|>" \
          "5" "$_SeeConfOptTitle" \
-          "6" "Chroot into installation" \
+          "6" "$_ChrootTitle" \
          "7" "$_Back" 2>${ANSWER}
        HIGHLIGHT_SUB=$(cat ${ANSWER})

@ -181,7 +181,7 @@ install_custom_menu() {
          "5" "$_InstMulCust" \
          "6" "$_SecMenuTitle|>" \
          "7" "$_SeeConfOptTitle" \
-          "8" "Chroot into installation" \
+          "8" "$_ChrootTitle" \
          "9" "$_Back" 2>${ANSWER}
        HIGHLIGHT_SUB=$(cat ${ANSWER})