diff --git a/CHANGELOG b/CHANGELOG index a5c084e9..b850ffd4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ Changelog (English) =================== +2.0.3 +Added GNU dd utility (issue #729) +Added support for arm64 architecture in Gentoo +Fixed problem with set the variable name using the "config" command +Translated into Indonesian (issue #851) + 2.0.2 Fixed an architecture emulation via binfmt_misc Fixed Arch Linux bootstrap (+libnghttp2, -xorg-utils) @@ -371,6 +377,12 @@ Updated list packages of base system installation История изменений (Русский) =========================== +2.0.3 +Добавлена GNU версия утилиты dd (тикет #729) +Добавлена поддержка архитектуры arm64 в Gentoo +Исправлена проблема с установкой имен переменных через команду "config" +Переведено на индонезийский язык (тикет #851) + 2.0.2 Исправлена проблема с эмуляцией архитектуры через binfmt_misc Исправлен установщик Arch Linux (+libnghttp2, -xorg-utils) diff --git a/app/build.gradle b/app/build.gradle index 2943f158..4b870c25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId 'ru.meefik.linuxdeploy' minSdkVersion 10 targetSdkVersion 25 - versionCode 225 - versionName "2.0.2" + versionCode 226 + versionName "2.0.3" } buildTypes { release { diff --git a/app/src/main/assets/bin/arm/dd b/app/src/main/assets/bin/arm/dd new file mode 100755 index 00000000..040a74af Binary files /dev/null and b/app/src/main/assets/bin/arm/dd differ diff --git a/app/src/main/assets/bin/intel/dd b/app/src/main/assets/bin/intel/dd new file mode 100755 index 00000000..c4fee8ae Binary files /dev/null and b/app/src/main/assets/bin/intel/dd differ diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml index c8f994d6..9ed57326 100644 --- a/app/src/main/res/values-de/arrays.xml +++ b/app/src/main/res/values-de/arrays.xml @@ -10,6 +10,7 @@ Verzeichnis Partition RAM + Custom Auto diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2526bbea..078b4d51 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -10,7 +10,6 @@ Leeren Neu Bearbeiten - Alles markieren Einstellungen Eigenschaften Profile diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index b804a916..364a7425 100644 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -10,6 +10,7 @@ Directorio Partición RAM + Custom Auto diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d6f8deb8..88620949 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -13,7 +13,6 @@ Nuevo Editar Borrar - Marcar todo Perfil actual Sobre Configuración diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml index ff005209..816c851e 100644 --- a/app/src/main/res/values-fr/arrays.xml +++ b/app/src/main/res/values-fr/arrays.xml @@ -10,6 +10,7 @@ Répertoire Partition RAM + Custom Automatique diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 385bbc58..c59da1c1 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -13,7 +13,6 @@ Nouveau Editer Supprimer - Sélectionner tout Profil courant A propos Paramètres diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6c4e1297..bd8107f3 100755 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,6 +1,5 @@ - "Linux Deploy" "Versi %s" "MULAI" "BERHENTI" @@ -28,7 +27,6 @@ "Memperbarui lingkungan operasi ..." "Menghapus lingkungan operasi ..." "Profil saat ini" - "Linux Deploy" "Tentang" "Pengaturan" "Properti" @@ -312,7 +310,7 @@ "Paksa penyegaran" "Paksa refresh framebuffer" - "\n<b>Bantuan</b>\n\nAplikasi ini untuk menginstal distribusi GNU/Linux yang dipilih dan menjalankannya dalam container chroot.\n\nProsedur:\n1. Dapatkan hak istimewa superuser (root).\n2. Periksa koneksi Internet.\n3. Tentukan pilihan instalasi.\n4. Jalankan instalasi (\"Menu => Install\").\n5. Tunggu sampai penginstalan selesai.\n6. Ketuk tombol \"START\" untuk menjalankan container.\n7. Sambungkan melalui CLI, SSH, VNC, atau lainnya.\n\nUntuk informasi lebih lanjut, lihat \"Tentang\"." - "Aplikasi ini untuk menginstal distribusi GNU/Linux yang dipilih dan menjalankannya dalam container chroot.\n\nUntuk informasi lebih lanjut, lihat <a href=\"https://github.com/meefik/linuxdeploy\">halaman project</a>, <a href=\"http://4pda.ru/forum/index.php?showtopic=378043\">forum</a> atau <a href=\"http://meefik.ru\">situs pengembang</a>.\n\n© 2012-2017 Anton Skshidlevsky, GPLv3" + "\nBantuan\n\nAplikasi ini untuk menginstal distribusi GNU/Linux yang dipilih dan menjalankannya dalam container chroot.\n\nProsedur:\n1. Dapatkan hak istimewa superuser (root).\n2. Periksa koneksi Internet.\n3. Tentukan pilihan instalasi.\n4. Jalankan instalasi (\"Menu => Install\").\n5. Tunggu sampai penginstalan selesai.\n6. Ketuk tombol \"START\" untuk menjalankan container.\n7. Sambungkan melalui CLI, SSH, VNC, atau lainnya.\n\nUntuk informasi lebih lanjut, lihat \"Tentang\"." + "Aplikasi ini untuk menginstal distribusi GNU/Linux yang dipilih dan menjalankannya dalam container chroot.\n\nUntuk informasi lebih lanjut, lihat halaman project, forum atau situs pengembang.\n\n© 2012-2017 Anton Skshidlevsky, GPLv3" \ No newline at end of file diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml index 579a3522..325fcac2 100644 --- a/app/src/main/res/values-it/arrays.xml +++ b/app/src/main/res/values-it/arrays.xml @@ -10,6 +10,7 @@ Direttorio Partizione RAM + Custom Auto diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6f49d57d..87d8c879 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -13,7 +13,6 @@ Nuovo Modifica Elimina - Seleziona tutto Profilo corrente Info su Impostazioni diff --git a/app/src/main/res/values-ko/arrays.xml b/app/src/main/res/values-ko/arrays.xml index d9ffca7e..7a49fcdd 100644 --- a/app/src/main/res/values-ko/arrays.xml +++ b/app/src/main/res/values-ko/arrays.xml @@ -10,6 +10,7 @@ 폴더 파티션 메모리(RAM) + Custom 자동 diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml index f2060879..8988cac1 100644 --- a/app/src/main/res/values-pl/arrays.xml +++ b/app/src/main/res/values-pl/arrays.xml @@ -10,6 +10,7 @@ Katalog Partycja RAM + Custom Automatyczny diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2af003f7..544c4384 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -15,7 +15,6 @@ Edytuj Usuń Eksportuj - Zaznacz wszystko Obecny profil O programie Ustawienia diff --git a/app/src/main/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml index 9cba3fef..d8bb9a60 100644 --- a/app/src/main/res/values-pt/arrays.xml +++ b/app/src/main/res/values-pt/arrays.xml @@ -10,6 +10,7 @@ Diretório Partição RAM + Custom Automático diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e3a61915..4bab9cad 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -15,7 +15,6 @@ Editar Excluir Exportar - Selecionar todos Perfil atual Sobre Configurações diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b25c3b3a..27a67873 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -17,7 +17,6 @@ Добавить Изменить Удалить - Отметить все Текущий профиль О программе Настройки diff --git a/app/src/main/res/values-sk/arrays.xml b/app/src/main/res/values-sk/arrays.xml index 9abf07c8..237b1102 100644 --- a/app/src/main/res/values-sk/arrays.xml +++ b/app/src/main/res/values-sk/arrays.xml @@ -10,6 +10,7 @@ Adresár Na oddiel Do pamäte RAM + Custom Automatický diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 6596da11..7e9b6314 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -10,7 +10,6 @@ Nový Upraviť Odstrániť - Označiť všetko Aktuálny profil O aplikácii Nastavenia diff --git a/app/src/main/res/values-vi/arrays.xml b/app/src/main/res/values-vi/arrays.xml index c8fcaa18..f9402a7f 100644 --- a/app/src/main/res/values-vi/arrays.xml +++ b/app/src/main/res/values-vi/arrays.xml @@ -10,6 +10,7 @@ Thư mục Phân vùng RAM + Custom Tự động diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 7ca4cd5f..c023182f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -13,7 +13,6 @@ Mới Sửa Xoá - Đánh dấu tất cả Hồ sơ hiện tại Thông tin Cài đặt diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml index d44454d3..a6d23e43 100644 --- a/app/src/main/res/values-zh/arrays.xml +++ b/app/src/main/res/values-zh/arrays.xml @@ -10,6 +10,7 @@ 目錄的 分区 RAM + Custom 自动 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 096df0fc..7e8a0a35 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -13,7 +13,6 @@ 新建 编辑 删除 - 全选 当前配置文件 关于 设置 diff --git a/contrib/dd/README.md b/contrib/dd/README.md new file mode 100644 index 00000000..d5775145 --- /dev/null +++ b/contrib/dd/README.md @@ -0,0 +1,22 @@ +dd Build Guide +============================== + +dd - convert and copy a file. + +#### Build instruction #### + +1) Prepare chroot environment (QEMU, Debian 7.0, armel). + +2) Get coreutils (includes dd): + + apt-get build-dep coreutils + apt-get source coreutils + +3) Build dd: + + cd ./coreutils-8.13 + ./configure + make CFLAGS=-static LDFLAGS=-static + strip -s ./src/dd + +4) Copy dd binary to assets directory. diff --git a/locales_replace.sh b/locales_replace.sh deleted file mode 100755 index cc695712..00000000 --- a/locales_replace.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash - -FILE_NAME="strings.xml" - -sed -i 's|menu_settings|nav_settings|g' $FILE_NAME -sed -i 's|menu_about|nav_about|g' $FILE_NAME -sed -i 's|menu_exit|nav_exit|g' $FILE_NAME -sed -i 's|menu_terminal|nav_terminal|g' $FILE_NAME -sed -i 's|menu_new|menu_add|g' $FILE_NAME -sed -i 's|menu_discard|menu_delete|g' $FILE_NAME -sed -i 's|confirm_mount_discard_title|confirm_mount_delete_title|g' $FILE_NAME -sed -i 's|confirm_mount_discard_message|confirm_mount_delete_message|g' $FILE_NAME -sed -i 's|title_mountdir_preference|title_env_dir_preference|g' $FILE_NAME -sed -i 's|dialog_title_mountdir_preference|dialog_title_env_dir_preference|g' $FILE_NAME -sed -i 's|title_busyboxdir_preference|title_path_preference|g' $FILE_NAME -sed -i 's|title_usecli_preference|title_is_cli_preference|g' $FILE_NAME -sed -i 's|summary_usecli_preference|summary_is_cli_preference|g' $FILE_NAME -sed -i 's|title_debug_preference|title_debug_mode_preference|g' $FILE_NAME -sed -i 's|summary_debug_preference|summary_debug_mode_preference|g' $FILE_NAME -sed -i 's|title_trace_preference|title_trace_mode_preference|g' $FILE_NAME -sed -i 's|summary_trace_preference|summary_trace_mode_preference|g' $FILE_NAME -sed -i 's|title_install_preference|menu_install|g' $FILE_NAME -sed -i 's|title_reconfigure_preference|menu_configure|g' $FILE_NAME -sed -i 's|title_distribution_preference|title_distrib_preference|g' $FILE_NAME -sed -i 's|dialog_title_distribution_preference|dialog_title_distrib_preference|g' $FILE_NAME -sed -i 's|title_mirror_preference|title_source_path_preference|g' $FILE_NAME -sed -i 's|dialog_title_mirror_preference|dialog_title_path_preference|g' $FILE_NAME -sed -i 's|title_architecture_preference|title_arch_preference|g' $FILE_NAME -sed -i 's|dialog_title_architecture_preference|dialog_title_arch_preference|g' $FILE_NAME -sed -i 's|title_deploytype_preference|title_target_type_preference|g' $FILE_NAME -sed -i 's|dialog_title_deploytype_preference|dialog_title_target_type_preference|g' $FILE_NAME -sed -i 's|title_diskimage_preference|title_target_path_preference|g' $FILE_NAME -sed -i 's|dialog_title_diskimage_preference|dialog_title_target_path_preference|g' $FILE_NAME -sed -i 's|title_disksize_preference|title_disk_size_preference|g' $FILE_NAME -sed -i 's|dialog_title_disksize_preference|dialog_title_disk_size_preference|g' $FILE_NAME -sed -i 's|summary_disksize_preference|summary_disk_size_preference|g' $FILE_NAME -sed -i 's|title_fstype_preference|title_fs_type_preference|g' $FILE_NAME -sed -i 's|dialog_title_fstype_preference|dialog_title_fs_type_preference|g' $FILE_NAME -sed -i 's|title_username_preference|title_user_name_preference|g' $FILE_NAME -sed -i 's|dialog_title_username_preference|dialog_title_user_name_preference|g' $FILE_NAME -sed -i 's|title_password_preference|title_user_password_preference|g' $FILE_NAME -sed -i 's|dialog_title_password_preference|dialog_title_user_password_preference|g' $FILE_NAME -sed -i 's|title_serverdns_preference|title_dns_preference|g' $FILE_NAME -sed -i 's|dialog_title_serverdns_preference|dialog_title_dns_preference|g' $FILE_NAME -sed -i 's|summary_serverdns_preference|summary_dns_preference|g' $FILE_NAME -sed -i 's|title_desktopenv_preference|title_desktop_preference|g' $FILE_NAME -sed -i 's|dialog_title_desktopenv_preference|dialog_title_desktop_preference|g' $FILE_NAME -sed -i 's|title_sshstartup_preference|title_is_ssh_preference|g' $FILE_NAME -sed -i 's|summary_sshstartup_preference|summary_is_ssh_preference|g' $FILE_NAME -sed -i 's|title_sshproperties_preference|title_ssh_properties_preference|g' $FILE_NAME -sed -i 's|summary_sshproperties_preference|summary_ssh_properties_preference|g' $FILE_NAME -sed -i 's|title_guistartup_preference|title_is_gui_preference|g' $FILE_NAME -sed -i 's|summary_guistartup_preference|summary_is_gui_preference|g' $FILE_NAME -sed -i 's|title_guitype_preference|title_graphics_preference|g' $FILE_NAME -sed -i 's|dialog_title_guitype_preference|dialog_title_graphics_preference|g' $FILE_NAME -sed -i 's|title_guiproperties_preference|title_gui_properties_preference|g' $FILE_NAME -sed -i 's|summary_guiproperties_preference|summary_gui_properties_preference|g' $FILE_NAME -sed -i 's|title_customstartup_preference|title_is_init_preference|g' $FILE_NAME -sed -i 's|summary_customstartup_preference|summary_is_init_preference|g' $FILE_NAME -sed -i 's|title_custommount_preference|title_is_mounts_preference|g' $FILE_NAME -sed -i 's|summary_custommount_preference|summary_is_mounts_preference|g' $FILE_NAME -sed -i 's|title_mountseditor_preference|title_mounts_editor_preference|g' $FILE_NAME -sed -i 's|summary_mountseditor_preference|summary_mounts_editor_preference|g' $FILE_NAME -sed -i 's|title_sshport_preference|title_ssh_port_preference|g' $FILE_NAME -sed -i 's|dialog_title_sshport_preference|dialog_title_ssh_port_preference|g' $FILE_NAME -sed -i 's|title_vncdisplay_preference|title_vnc_display_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncdisplay_preference|dialog_title_vnc_display_preference|g' $FILE_NAME -sed -i 's|title_vncdepth_preference|title_vnc_depth_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncdepth_preference|dialog_title_vnc_depth_preference|g' $FILE_NAME -sed -i 's|title_vncdpi_preference|title_vnc_dpi_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncdpi_preference|dialog_title_vnc_dpi_preference|g' $FILE_NAME -sed -i 's|title_vncwidth_preference|title_vnc_width_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncwidth_preference|dialog_title_vnc_width_preference|g' $FILE_NAME -sed -i 's|title_vncheight_preference|title_vnc_height_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncheight_preference|dialog_title_vnc_height_preference|g' $FILE_NAME -sed -i 's|title_vncargs_preference|title_vnc_args_preference|g' $FILE_NAME -sed -i 's|dialog_title_vncargs_preference|dialog_title_vnc_args_preference|g' $FILE_NAME -sed -i 's|xserver_preferences|x11_preferences|g' $FILE_NAME -sed -i 's|title_xdisplay_preference|title_x11_display_preference|g' $FILE_NAME -sed -i 's|dialog_title_xdisplay_preference|dialog_title_x11_display_preference|g' $FILE_NAME -sed -i 's|title_xhost_preference|title_x11_host_preference|g' $FILE_NAME -sed -i 's|dialog_title_xhost_preference|dialog_title_x11_host_preference|g' $FILE_NAME -sed -i 's|title_xserverxsdl_preference|title_x11_sdl_preference|g' $FILE_NAME -sed -i 's|summary_xserverxsdl_preference|summary_x11_sdl_preference|g' $FILE_NAME -sed -i 's|title_fbdisplay_preference|title_fb_display_preference|g' $FILE_NAME -sed -i 's|dialog_title_fbdisplay_preference|dialog_title_fb_display_preference|g' $FILE_NAME -sed -i 's|title_fbdpi_preference|title_fb_dpi_preference|g' $FILE_NAME -sed -i 's|dialog_title_fbdpi_preference|dialog_title_fb_dpi_preference|g' $FILE_NAME -sed -i 's|title_fbdev_preference|title_fb_dev_preference|g' $FILE_NAME -sed -i 's|dialog_title_fbdev_preference|dialog_title_fb_dev_preference|g' $FILE_NAME -sed -i 's|title_fbinput_preference|title_fb_input_preference|g' $FILE_NAME -sed -i 's|dialog_title_fbinput_preference|dialog_title_fb_input_preference|g' $FILE_NAME -sed -i 's|title_fbargs_preference|title_fb_args_preference|g' $FILE_NAME -sed -i 's|dialog_title_fbargs_preference|dialog_title_fb_args_preference|g' $FILE_NAME -sed -i 's|title_fbrefresh_preference|title_fb_refresh_preference|g' $FILE_NAME -sed -i 's|summary_fbrefresh_preference|summary_fb_refresh_preference|g' $FILE_NAME -sed -i 's|title_fbfreeze_preference|title_fb_freeze_preference|g' $FILE_NAME -sed -i 's|title_export_preference|title_export_dialog|g' $FILE_NAME -sed -i 's|dialog_title_fbfreeze_preference|dialog_title_fb_freeze_preference|g' $FILE_NAME -sed -i 's|message_reconfigure_confirm_dialog|message_configure_dialog|g' $FILE_NAME -sed -i 's|message_install_confirm_dialog|message_install_dialog|g' $FILE_NAME -