diff --git a/BUILDME.sh b/BUILDME.sh
index 0c108171f..d59a9b3ec 100755
--- a/BUILDME.sh
+++ b/BUILDME.sh
@@ -104,6 +104,7 @@ IMAGES_DIR="output/images"
SKIP_KERNEL_REBUILD=0
SKIP_RECOVERY_REBUILD=0
+UPDATE_TS=0
for i in $*; do
# Update raspberrypi/firmware master HEAD version in package/rpi-firmware/rpi-firmware.mk to latest
@@ -121,6 +122,11 @@ for i in $*; do
update_github_kernel_version raspberrypi/linux rpi-4.14.y
fi
+ # Update language TS files
+ if [ $i = "update-ts" ]; then
+ UPDATE_TS=1
+ fi
+
# Option to build just recovery without completely rebuilding both kernels
if [ $i = "skip-kernel-rebuild" ]; then
SKIP_KERNEL_REBUILD=1
@@ -148,7 +154,9 @@ fi
make
# copy any updated translation files
-cp $BUILD_DIR/recovery-$(get_package_version recovery)/*.ts ../recovery
+if [ $UPDATE_TS -eq 1 ]; then
+ cp $BUILD_DIR/recovery-$(get_package_version recovery)/*.ts ../recovery
+fi
# Create output dir and copy files
FINAL_OUTPUT_DIR="../$NOOBS_OUTPUT_DIR"
diff --git a/README.md b/README.md
index 5f64c34dc..407920888 100644
--- a/README.md
+++ b/README.md
@@ -1,355 +1,327 @@
-# NOOBS (New Out of Box Software)
-#### An easy Operating System installer for the Raspberry Pi
-
-NOOBS is designed to make it easy to select and install operating systems for the Raspberry Pi without having to worry about manually imaging your SD card.
-
-The latest official release of NOOBS can be downloaded from http://downloads.raspberrypi.org/NOOBS_latest
-
-For information on previous releases and version changelists, visit https://github.com/raspberrypi/noobs/releases
-
-
-
-*NOTE: The list of OSes in this image is indicative only. It will vary according to your Raspberry Pi model and the availability of OSes on our remote download repository.
-
-### About
-On first boot NOOBS will format your SD card and allow you to select which OSes you want to install from a list. This OS list is automatically generated from both locally available OSes (i.e. those contained in the `/os` directory on disk) or those available from our remote repository (network connection required).
-
-Only the latest version of each OS will ever be displayed meaning that you can be sure that you have installed the most up-to-date release of your selected OS.
-
-On any subsequent boot you can then press the SHIFT key to enter the NOOBS interface and easily reinstall your choice of OSes.
-
-The NOOBS interface provides the following functionality:
-- Install : Installs the selected OSes onto your SD card. Changing this selection erases all OSes currently installed.
-- Edit Config : Opens a text editor allowing the cmdline and config for the selected installed OS to be edited.
-- Online Help : [Networking Required] Open a browser that displays the Raspberry Pi Help page ( http://www.raspberrypi.org/help/ ), allowing people to quickly access help and troubleshooting.
-- Exit : Quits NOOBS and reboots the Pi into the OS boot menu.
-- Language Selection : Allows you to select the language to be displayed.
-- Keyboard Layout Selection : Allows you to select the keyboard layout to be used.
-- Display Mode Selection : By default, NOOBS will output over HDMI at your display's preferred resolution, even if no HDMI display is connected. If you do not see any output on your HDMI display or are using the composite output, press 1, 2, 3 or 4 on your keyboard to select HDMI preferred mode, HDMI safe mode, composite PAL mode or composite NTSC mode respectively.
-
-Note that all user settings (language, keyboard layout, display mode) will persist between reboots and will also be automatically passed to the installed OSes. This means that if you can see the NOOBS interface on your display device then you should be able to see the OS CLI/GUI when it boots too!
-### Setup
-
-To set up a blank SD card with NOOBS:
-- Format an SD card that is 8GB or greater in size as FAT32 (see instructions on how to do this below)
-- Download and extract the files from the NOOBS zip file. (Windows built-in zip features may have trouble with this file. If so, use another program such as [7zip](http://www.7-zip.org/).)
-- Copy the extracted files onto the SD card that you just formatted so that this file is at the root directory of the SD card.
- Please note that in some cases it may extract the files into a folder, if this is the case then please copy across the files from inside the folder rather than the folder itself.
-
-On first boot the "RECOVERY" FAT partition will be automatically resized to a minimum and a list of OSes that are available to install will be displayed.
-
-### Operating System Choice
-
-NOOBS is available in 2 formats:
-- `NOOBS Full` includes the installation files for Raspbian only.
-- `NOOBS-Lite` does not include any Operating Systems at all.
-
-#### OS Network Download
-
-Both versions of NOOBS allow additional Operating Systems to be downloaded from our remote repository. To do this, the Raspberry Pi must be connected to a wired network, or it can connect over Wifi using the [Raspberry Pi USB wifi dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/) or the Raspberry Pi 3 Model B built-in wifi.
-
-Once connected, the Pi will only show a list of Operating Systems that are appropriate to your Pi Model. If you want to see ALL available OSes, edit the `recovery.cmdline` file in the root NOOBS directory and append `showall` to the arguments list.
-
-#### Wired Networks
-
-If a wired ethernet cable is plugged into the Pi before NOOBS starts, NOOBS will connect via DHCP to our remote download repository and present a list of available Operating Systems that are available for installation.
-
-#### Wifi Networks
-
-If you have the official [Raspberry Pi USB wifi Dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/), or are using the Raspberry Pi 3 Model B with built-in wifi, the wifi icon on the NOOBS toolbar will be available. Click on this to select your Wifi SSID network and enter the wifi password.
-
-
-
-### How to Format an SD card as FAT
-
-For Windows users, we recommend formatting your SD card using the SD Association's Formatting Tool, which can be downloaded from https://www.sdcard.org/downloads/formatter_4/ You will need to set "FORMAT SIZE ADJUSTMENT" option to "ON" in the "Options" menu to ensure that the entire SD card volume is formatted - not just a single partition. With the latest SD Association Formatting Tool (V5.0) that option has been removed and is now the default. For more detailed and beginner-friendly formatting instructions, please refer to http://www.raspberrypi.org/quick-start-guide
-
-The SD Association's Formatting Tool is also available for Mac users although the default OSX Disk Utility is also capable of formatting the entire disk (select the SD card volume and choose "Erase" with "MS-DOS" format).
-
-For Linux users we recommend `gparted` (or the command line version `parted`). (Update: Norman Dunbar has written up the following formatting instructions for Linux users: http://qdosmsq.dunbar-it.co.uk/blog/2013/06/noobs-for-raspberry-pi/ )
-
-===
-
-### Screenshots
-
-#### OS Installation
-
-Simply select the checkbox next to each OS you want to install using either a mouse or keyboard (arrow keys to traverse the list, enter to toggle the selected OS's checkbox), then click the "Install" icon (or press "i" on your keyboard) to install the selection. The icons shown on the right of the list indicate whether the OS is being installed from the SD card (SD card icon) or from the online OS repository (Ethernet icon).
-
-
-
-*NOTE: The list of OSes in this image is indicative only. It will vary according to your Raspberry Pi model and the availability of OSes on our remote download repository.
-
-
-#### Online Help via Web Browser
-
-The built-in Arora web browser allows you to easily get help via the Raspberry Pi Forums (wired network connection required).
-
-
-
-#### Easy Config File Editor
-
-The built-in config file editor allows you to edit the config file of the OS currently highlighted in the OS list. This allows you to easily add license keys to different OS installs through the same interface.
-
-Note that the output mode selected by the user through pressing one of number keys 1 to 4 (for HDMI preferred, HDMI VGA, Composite PAL and Composite NTSC respectively), will be automatically set in the `config.txt` files of your installed OSes. This means that you shouldn't have to worry about manually changing your display settings to get your installed OS to display correctly on your display device.
-
-
-
-#### Installer Slideshow
-
-An installer slideshow guides you through your first steps with each OS while it installs.
-
-
-
-#### OS Boot Selector
-
-After multiple OSes have been installed, you can select which OS to boot through this selection window that is automatically displayed. NOOBS will remember your choice and boot this OS by default unless a different option has been selected within 10 seconds.
-
-Note that if only one OS is installed then the boot selector will not be displayed and the OS will be automatically booted.
-
-
-
-==
-
-## Advanced Usage (for experts and teachers)
-
-### How to Automatically Install an OS
-
-Even if you are using your Pi without a display, you can still use NOOBS to easily install an OS of your choice. To set up NOOBS to automatically and silently (i.e. without requiring any user input) install a specific OS, follow these steps:
-
-1. Copy the OS folder for the OS you want to install into the `/os` dir (or alternatively delete all other OSes contained in the `/os` dir so that only your chosen OS remains.
-
-2. If the OS you want to automatically install has multiple flavours available, edit the `flavours.json` file so that it only contains the flavour entry that you want to install.
-
-3. Edit the `recovery.cmdline` file in the root NOOBS directory and append `silentinstall` to the arguments list.
-
-When you now boot your Pi using an SD card containing the modified version of NOOBS that you just created, it will automatically install the OS you chose and boot into it after the installation has finished.
-
-### Preconfiguring a WiFi network
-
-If you already know your WiFi details, you can preconfigure NOOBS to use it straight away. Put a copy of your `wpa_supplicant.conf` file on the NOOBS root partition and NOOBS will read it and store it in its settings for all future uses.
-
-### How to create a custom OS version
-
-There are two main use cases for which you may want to create a custom version of one of the standard OS releases that is suitable for installation via NOOBS:
-- If you are a teacher wanting to easily deploy a custom OS release containing pre-defined set of packages and files onto a number of SD cards (e.g. to provision a class set of Raspberry Pi's or quickly restore a Raspberry Pi back to custom "factory" settings).
-- If you want to be able to back up your existing installed packages and files so that any future OS re-install does not force you back to a clean install.
-
-The following steps allow you to create a modified copy of one of the standard OS releases that contains your custom files, packages and settings.
-
-1. Download a base version of NOOBS from http://downloads.raspberrypi.org/NOOBS_latest
-
-2. Extract the NOOBS zipfile
-
-3. Navigate to the `os` directory
-
-4. Create a copy of the folder containing the OS release that you want to modify and rename it with a custom name.
-
-5. Edit the following fields in the `os.json` file contained in the folder that you just created
- 1. "name" - replace the name of the base OS with the name of your custom OS version
- 2. "description" - replace the description of the standard OS install with one for your custom OS version
-
-6. [Optional] Rename or replace the existing `.png` icon file with one matching the name of your custom OS version
-
-7. [Optional] Replace the PNG image files in the `slides` and `slides_vga` directory with your own custom installer slides
-
-8. Edit the following fields in the `partitions.json` file contained in the folder that you just created
- 1. "partition_size_nominal" - replace the numerical value with the size of the paritions in your custom OS version
- 2. "uncompressed_tarball_size" - replace the numerical value with the size of your filesystem tarballs when uncompressed
-
-9. Replace the `.tar.xz` root and boot filesystem tarballs with copies created from your custom OS version (these instructions assume you're only using a single OS at a time with NOOBS - they won't work if you're running multiple OSes from a single SD card). The name of these tarballs needs to match the labels given in `partitions.json`.
- 1. To create the root tarball you will need to run `bsdtar --numeric-owner --format gnutar --one-file-system -cpf .tar .` from within the root filesystem of your custom OS version. You should then compress the resulting tarball with `xz -9 -e .tar`.
- 2. To create the boot tarball you will need to run `bsdtar --numeric-owner --format gnutar -cpf .tar .` at the root directory of the boot partition of your custom OS version. You should then compress the resulting tarball with `xz -9 -e .tar`.
-
-### How to change the default Language, Keyboard layout, Display mode or Boot Partition etc.
-
-Edit the `recovery.cmdline` file in the root NOOBS directory and append the following arguments where relevant:
-- `lang=` (e.g. `lang=de` or `lang=en`)
-- `keyboard=` (e.g. `keyboard=de` or `keyboard=us`)
-- `display=` (e.g. `display=1` or `display=3`)
-- `partition=` (e.g. `partition=6`)
-- `showall` (shows all available OSes regardless of your Raspberry Pi model)
-
-Note that these defaults will be overwritten by any changes made in the GUI to these settings.
-
-### How to bypass the Recovery splashscreen and boot directly into a fixed partition
-
-After you have installed your chosen OSes, add the following file to the root directory of NOOBS to force the indicated partition to be booted at power-on.
-
-1. Add a text file named `autoboot.txt` to the root directory of NOOBS.
-
-2. Add `boot_partition=` to the file and save it to disk.
-
-This will also prevent the splashscreen from being displayed at boot. The partition number can be found by running `sudo fdisk -l` the partition will be one of the FAT32 partitions `/dev/mmcblk0p6` would be partition 6. Note that once an `autoboot.txt` file is present, there's then no way to force the NOOBS GUI to display, until you delete (or rename) the `autoboot.txt` file.
-
-### How to use with the Raspberry Pi Touch Display
-
-If NOOBS detects you are using the [Raspberry Pi Touch Display](https://www.raspberrypi.org/products/raspberry-pi-touch-display/), it will enable the following functionality:
-- A tap on the raspberry logo in the centre of the touchscreen can activate NOOBS, as well as holding the shift key down.
-- A tap on the touchscreen will simulate a mouse click
-- A longpress on the touchscreen will simulate a mouse double-click.
-
-===
-
-## Troubleshooting
-
-#### What to do if your SHIFT keypress isn't detected
-
-Try pressing shift only when the grey splashscreen is displayed rather than holding it from boot up.
-
-#### How to boot into "Safe Mode"
-
-To boot into a basic busybox shell rather than launching the NOOBS GUI, you can *either*:
-
-1. Append `rescueshell` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-
-2. Insert a physical jumper between pins 5 & 6 of GPIO header P1. If you have external hardware or an addon board connected to the GPIO header, you may find that pin 5 is being pulled low and accidentally triggering "Safe Mode". To prevent this you can append `disablesafemode` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-
-#### How to enable using the GPIO to trigger entering Recovery Mode
-
-To force Recovery Mode to be entered on boot and to show the NOOBS interface, you normally press the `SHIFT` key during bootup. If you don't have a keyboard or the `SHIFT` keypress isn't being detected, you should complete the following steps to force the NOOBS interface to be displayed on boot:
-
-1. Append `gpiotriggerenable` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-To force Recovery Mode being entered on boot, connect GPIO pin 3 on header P1 to GND (pin 25). If GPIO pin 3 remains unconnected then it will boot through to the installed OS as normal.
-
-#### How to force Recovery Mode being entered on boot (overrides GPIO or keyboard input)
-
-Alternatively, if you are unable to use either the GPIO or keyboard to trigger entering Recovery Mode, you can:
-
-1. Append `forcetrigger` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-Note that with this option enabled, the Recovery Mode will be displayed every time you boot from your NOOBS card (until you edit `recovery.cmdline` again).
-
-#### How to disable using the keyboard to trigger entering Recovery Mode
-
-In some rare cases, you may find that NOOBS incorrectly detects a `SHIFT` keypress from your keyboard regardless of the presence of user input. In such cases it may be helpful to disable using the keyboard to trigger Recovery Mode being entered.
-
-To prevent a `SHIFT` keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot), you can:
-
-1. Append `keyboardtriggerdisable` to the argument list in the `recovery.cmdline` file which is found in the root NOOBS directory.
-2. Reboot
-
-#### How to change display output modes
-
-By default, NOOBS will output over HDMI at your display’s preferred resolution, even if no HDMI display is connected. If you do not see any output on your HDMI display or are using the composite output, press 1, 2, 3 or 4 on your keyboard to select HDMI preferred mode, HDMI safe mode, composite PAL mode or composite NTSC mode respectively.
-
-If you don't have a keyboard, you can still change the display mode used by NOOBS through editing the `recovery.cmdline` file in the root NOOBS directory prior to first boot and appending the following argument:
-- `display=` (e.g. `display=1` or `display=3`)
-
-===
-
-## How to Rebuild NOOBS
-
-Note that this will require a minimum of 6GB free disk space.
-
-#### Get Build Dependencies
-
-On Ubuntu:
-
-`sudo apt-get install build-essential rsync texinfo libncurses-dev whois unzip bc qt4-linguist-tools`
-
-#### Run Build Script
-
-`./BUILDME.sh`
-
-Buildroot will then build the software and all dependencies, putting the result in the `output` directory.
-
-Buildroot by default compiles multiple files in parallel, depending on the number of CPU cores you have.
-
-If your build machine does have a quad core CPU, but relatively little RAM, you may want
-to lower the number to prevent swapping:
-- `cd buildroot ; make menuconfig`
-- "Build options" -> "Number of jobs to run simultaneously"
-
-If your build machine also has some QT5 components, it is useful to `export QT_SELECT=4` before building to ensure the QT4 component versions are selected.
-
-## How to run your Build
-
-In order to setup an SD card with a newly built version of NOOBS, you will need to:
-- Format an SD card that is 8GB or greater in size as FAT32
-- Replace the `/os` directory in `/output` with the copy contained in the release version of NOOBS (see above for download links)
-- Copy the files in the `/output` directory onto the SD card
-
-## About the Buildroot infrastructure
-
-To add extra packages: `cd buildroot ; make menuconfig`
-
-Recovery software packaging is in: `buildroot/package/recovery`
-
-Kernel configuration used: `buildroot/kernelconfig-recovery.armv6` and `kernelconfig-recovery.armv7`
-
-Main differences with bcmrpi_defconfig:
-- `CONFIG_BLK_DEV_INITRD=y` - initramfs support
-- `CONFIG_INPUT_EVDEV=y` - evdev support built-in
-- `CONFIG_USB_HID=y` - usb HID driver built-in
-- All modules disabled.
-- (This has changed significantly from v1.5 to use a squashfs)
-
-## Modifying Qt source
-
-Source is in the `recovery` folder.
-Be aware that user interface screens will appear larger in Qt Creator then when deployed on the Pi, can
-raise font sizes 2 points to compensate.
-
-Several constants can be changed in `config.h`
-
-Wrap code that calls Qt Embedded specific classes (such as QWSServer) between
-```C
-#ifdef Q_WS_QWS
-```
-and
-```C
-#endif
-```
-so that the project also compiles and can be tested under standard Qt.
-
-## Adding/Updating Translations
-
-References:
-
-http://qt-project.org/doc/qt-4.8/i18n-source-translation.html
-
-http://qt-project.org/doc/qt-4.8/linguist-manual.html
-
-To set up a git pre-commit hook to automatically update the translation files, run the following commands in the project root:
-- `chmod +x pre-commit-translation-update-hook.sh`
-- `cp pre-commit-translation-update-hook.sh .git/hooks/pre-commit`
-
-To add a new translation:
-- Add to `recovery/recovery.pro` the following: `TRANSLATIONS += translation_.ts`
-- Run `lupdate recovery/recovery.pro` which extracts strings from the source code and generates/updates the *.ts* files.
-- The *.ts* can then be sent to the translator, opened in Qt Linguist and filled in.
-- Add a line for the *.ts* file in to `recovery/icons.qrc`, but substitute *.ts* extension with *.qm* . This file contains a list
- of resource files that will be embedded into the application's executable during build.
-- Add a flag icon for your language from http://www.famfamfam.com/lab/icons/flags/ flag icon collection or if it
- doesn't have the one you need, you may use some other small png icon for it. Copy the icon file to the `recovery/icons`
- folder and add a line for it into `recovery/icons.qrc` as well.
-
-
-### Legal compliance
-
-Copyright (c) 2013, Raspberry Pi
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the Raspberry Pi Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#### Third party licenses:
-
-Recovery software directly links to:
-- Qt libraries, available under LGPL and commercial license.
-
-Currently used icon sets:
-- http://www.fatcow.com/free-icons - Creative commons Attribution license
-- http://www.famfamfam.com/lab/icons/flags - "These flag icons are available for free use for any purpose with no requirement for attribution."
-- http://www.oxygen-icons.org/ - Available under Creative Common Attribution-ShareAlike 3.0 and LGPL license
-
-Licenses of utility software build by buildroot:
-Type `cd buildroot ; make legal-info` to generate a list, which will be available under `output/legal-info`.
+# PINN (PINN is not NOOBS)
+#### An enhanced Operating System installer for the Raspberry Pi
+
+PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi. See the change history below for the additional features.
+
+### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c or later](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
+
+Documentation on how to use PINN can be found in **[README_PINN.md](README_PINN.md)**, which includes all of the original NOOBS documentation.
+
+If you are already familiar with NOOBS' features, you may prefer to read the reduced documenation that just contains **[PINN's new features](changes.md)** alone.
+
+The latest version of **[PINN-lite](http://sourceforge.net/projects/pinn/files/pinn-lite.zip)** can be downloaded from [sourceforge](http://www.sourceforge.net/projects/pinn).
+
+Source code is available from [github](https://github.com/procount/pinn)
+
+see [github](https://github.com/procount/pinn) for full information
+
+## Quick Start
+
+#### Format your SD card as FAT32
+
+For **Windows** users, we recommend formatting your SD card using the SD Association's Formatting Tool, which can be downloaded from https://www.sdcard.org/downloads/formatter_4/ .
+If you are still using v4 of this tool, you will need to set the "FORMAT SIZE ADJUSTMENT" option to "ON" in the "Options" menu to ensure that the entire SD card volume is formatted - not just a single partition. However, this tool has now been upgraded to v5 where this feature is now the default and is no longer selectable. For more detailed and beginner-friendly formatting instructions, please refer to http://www.raspberrypi.org/quick-start-guide .
+
+The SD Association's Formatting Tool is also available for Mac users. However, note that the default OSX Disk Utility is also capable of formatting the entire disk (select the SD card volume and choose "Erase" with "MS-DOS" format).
+
+For **Linux** users, we recommend `gparted` (or the command line version `parted`). (Update: Norman Dunbar has written up the following formatting instructions for Linux users: http://qdosmsq.dunbar-it.co.uk/blog/2013/06/NOOBS-for-raspberry-pi/)
+
+#### Copy the pinn files to your SD card.
+
+- Download **[pinn-lite.zip](http://sourceforge.net/projects/pinn/files/pinn-lite.zip)** from [sourceforge](http://www.sourceforge.net/projects/pinn)
+- Extract the files from pinn-lite.zip file onto the SD card. (Windows built-in zip features may have trouble with this file. If so, use another program such as 7zip.)
+
+Please note that in some cases it may extract the files into a folder, if this is the case then please copy across the files from inside the folder rather than the folder itself.
+
+#### Boot pinn on your PI
+- Put the PINN SD card into your Pi and boot it.
+- On first boot the "RECOVERY" FAT partition will be automatically resized to a minimum, so if you ever put your SD card back into a Windows machine it will look like a very small partition. THIS IS NORMAL.
+- PINN does not come supplied with any OSes. You must download them from the internet or provide them on a USB stick. So,....
+- Connect your Pi to the internet with an Ethernet cable (easiest)
+- Or If you prefer to use Wifi, click on the wifi button and select your SSID and password. If the wifi button is greyed out, choose another type of wifi dongle.
+- A list of OSes that are available to install will be displayed.
+- Select one or more OSes that you want and click INSTALL.
+
+
+## Change History
+
+## V2.8.5.5
+
+- **Boot menu** - Sticky default now uses bootmenutimeout
+- **rebootp** - Added rebootp command to recovery shell
+
+## V2.8.5.4
+
+- **Boot menu** - Fixed focus and sticky default partuuid issues.
+- **wallpaper_resize** - Customised wallpaper can now be resized to fill the screen
+
+## V2.8.5.3
+
+- **Partuuid** - Fixed an issue from v2.8 where partuuids were introduced to installed_os.json
+- **Wallpaper** - Customised wallpaper is now available by writing your own `wallpaper.png` file to PINN's recovery partition## V2.8.5.1
+
+## V2.8.5.2
+
+- **VNCnotice** - Displays a notice on the main screen when vncinstall is in use
+- **PINN update** - Prevents crash on manual update when there is no network
+- **ae-ts** - tidy up of translations
+
+## V2.8.5.1
+
+- **Reinstall** - BUGFIX for Re-install.
+- **translations** - Updated it and zh_TW translations.
+- **silentreinstallnewer** - **USE WITH CAUTION**. With `select=` it will silently re-install any selected OSes that are newer than the installed version.
+
+### V2.8.5
+
+- **Boot Cancel** - Added a new cancel button to the bootselection dialog which will reboot back into PINN
+- **Swedish keyboard** - Swedish keyboard fixed when language selected
+- **Bootable selection** - The bootselection dialog is only available if a bootable OS is installed.
+- **Select Option** - Auto select/check OSes to be installed. "allsd,allusb,allnetwork,waitsd,waitusb,waitnetwork,waitall,allinstalled,"
+- **SilentInstall** - with Select will auto-install selected OSes
+- **Added Disablesdimages** - Disablesdimages in recovery.cmdline will prevent OSes on SD card from being shown
+- **Network start** - The network is always started, even with silentinstall.
+- **Flavour download** - Flavours can now be downloaded from remote repos. Only need to download 1
+- **Added flavours.tar.xz** - Remote flavours need to include flavours.tar.xz
+- **RPi Model Name** - Added name of RPi model to MainMenu screen
+
+### V2.8.4
+
+- **Replace OSes** - Allows the replacement of one OS with another
+- **Project Spaces** - Added Project Spaces
+- **Reserve disk space** - Reserve some space on PINN's partition before formatting
+- **mkimage** - Added mkimage from uboot
+- **xz** - Allow XZ Compression
+- **Update Dialog** - This now cancels any timeout setting
+
+### V2.8.3
+
+- **Programmable CEC** - Fixed bugs
+- **networktimeout** - Added timeout to detect network presence
+
+### V2.8.2
+
+- **Reinstall** - bugfix to Reinstall option following partuuid change on USBs
+
+### V2.8.1
+
+- **Programmable CEC** - Program your TV remote for use with PINN
+
+### V2.8
+
+- **Fix menu** - Replaced Fsck with Fix menu option to include a wider range of tools
+- **Store meta** - Additional meta files stored on installation for fix up tools
+- **Partuuid** - Store partuuid references for better USB support
+- **Tab fix** - Fixed synchronisation of OS tab display
+
+### V2.6.2
+
+- **pinn_init.sh** - Improve calling of script to run before PINN
+- **config.txt** - deleted
+
+### V2.6.1
+
+- **Kernel** - Bump kernel to suppress missing mailbox commands in old firmware
+- **pinn_init.sh** - Add initialisation script to run before PINN
+
+### V2.6
+
+- **Firmware** - Update firmware
+- **Kernel** - Update kernel to 4.14
+
+### V2.5.5
+
+- **Self-Update** - A small fix to the self-update ignore feature
+
+### V2.5.4
+
+- **Countdown** - Re-enabled the boot selection dialog countdown timer.
+
+### V2.5.3
+
+- **Switch firmware** - Enable switching of firmware for 3B+ and other models.
+
+### V2.5.2a
+
+Fixes the incorrect recovery.cmdline bug in v2.5.2.
+(There's a reason why I didn't make this v2.7 just yet!)
+
+### V2.5.2
+
+- **OS Firmware** - Includes a better method of slipstreaming new Firmware
+- **BUG: Cmdline** - Note that the recovery.cmdline is incorrect in this version
+### V2.5.1
+
+- **firmware** - New firmware for Rpi 3B+
+- **Kernel** - Update to kernel 4.9.80
+- **OS firmware** - Latest firmware is slip streamed onto old OSes
+- **wifi drivers** - Some wifi drivers temporarily removed until they can be upgraded
+- **Arora** - Prevented multiple instances of Arora browser running
+
+### V2.4.5f
+
+- **rtl8812 wifi** - added wifi driver for rtl8812 5GHz dongles
+
+### V2.4.5e
+
+- **remotetimeout** - Enable network for remote boot alteration.
+
+### V2.4.5b
+
+- **background** - The background has now been fixed on the bootmenu
+- **reinstall** - Reinstall should now use data from the NEW version rather than the OLD version
+
+### V2.4.5
+
+This is a small maintenance release for some cosmetic changes and bugfixes mainly.
+
+- **background** - Specify the background colour as background=r,g,b
+- **style** - Change the style with style=motif/windows/platinum
+- **configpath** - (partially) allow remote flavours to customise an OS
+- **dsi** - Allows the HDMI/DSI switching option to work with OSes installed to USB
+
+### V2.4.4
+
+Finally, PINN can now re-install any installed OS WITHOUT affecting the other OSes, eliminating one of my NOOBS bugbears.
+
+- **Re-install** - Re-install an OS without affecting others
+- **no_update** - disable PINN self-update (manual refesh of PINN available)
+- **update PINN** - A manual PINN update check can now be done (for when no_update is used)
+- **Edit PINN** - The recovery.cmdline and config.txt fiels of PINN can now be edited.
+- **no_cursor** - The no_cursor option now only affects the bootselection dialog
+- **Wipe** - The Wipe Disk command has been temporarily removed
+- **Max OSes** - The number of OSes has been restricted so that boot partitions numbers are <63
+
+### V2.4.3
+
+A major change to the User Interface in preparation for some new features.
+
+- **3 Toolbars** - Main Menu, Archival and Maintenance.
+- **OS Groups** - OS lists are grouped into General, Minimal, Educational, Media and Gaming.
+- **Download OS** - Download an OS to USB for local installation.
+- **Fsck** - Check and fix your filesystems in case of error.
+- **Wipe Disk** - delete all OSes and restore drive to full capacity.
+- **Info button** - Go directly to the webpage of each OS.
+
+### V2.4.2h
+
+- **Translations** - udpate to Portugese + other translations
+- **Password** - A new password will not expire
+- **Slideshow** - Slides during installation are now scaled to be the same size.
+- **>1TB MSDs** - Installing OSes to a USB Mass Storage Device > 1TB would fail. 2TB is the maximum size.
+
+### V2.4.2
+
+- **repo_list** - Added repo_list cmdline argument
+
+#### Bugfixes
+
+- **Win10IoT** - Fixed annoying warning messages on installation
+- **RTAndrod** - re-included missing cpio to allow installation
+
+### V2.4.1
+
+- **btrfs** - Added support for btrfs file systems
+
+### V2.4
+
+- **Update** - Rebase onto NOOBS 2.4
+- **repo** - Support "repo=" from NOOBS
+- **USB support** - Supports USB BOOT and USB ROOTFS
+
+### V2.3
+
+- **PiZeroW** - Further update to match NOOBS 2.3. Added regDB for channel 13 & missing DTBs
+
+### V2.2
+
+- **PiZeroW** - Update firmware/kernel for PiZero Wifi version
+
+### V2.1.4
+
+- **IP address** - Shown in window title
+- **CEC key mapping** - Replaced 0 button with PLAY button for greater applicability
+- **BOOT** - Added BOOT button to boot selection dialog for use with limited TV remotes
+- **Tarball names** - Allow local tarballs to have a different name to the partition labell
+- **SD Card** - Recommend 8GB card minimum
+- **SD Card** - Update SD card requirements
+- **Network** - Do not continue polling for connectivity during installation
+- **Update** - Bump kernel and firmware versions
+
+### V2.1.3
+
+- **Translations** - Added many translations from the community
+
+### V2.1.2
+
+- **Default Boot** - A default OS can be set in a multi-boot setup for quicker boots.
+- **Bootmenutimout** - The timeout of the boot selection dialog can be changed.
+- **SHIFT key** - The PINN interface can be reached using the Left mouse button as well as shift.
+
+### V2.1.1
+
+- **CEC Support** - Added CEC support to control PINN with a TV remote
+
+### V2.1
+
+- **IoTpHAT support** - Updated to match NOOBS v2.1 for IoTpHAT wifi
+
+### V2.0
+
+- **Network Drivers** - Added the popular RTL8188eu wifi driver (for HubPiWi and others)
+- **New Firmware** - Updated Firmware and Kernel to match NOOBS 2.0
+
+### V1.9.5
+
+- **Self-Update** - Notification and download of new releases
+
+#### Bugfixes
+
+- **Network Drivers** - Fixed the popular RTL8188cus wifi driver.
+- **RPI3 ACT_LED** - Now displays correctly on SD card access
+
+
+### V1.9.4
+
+- **Network Drivers** - A number of additional wifi and ethernet drivers have been added.
+
+#### Bugfixes
+
+- **Dialog Box** - The initialisation dialog box is removed under network errors
+
+
+### V1.9.3
+
+- **Clone SD Card** - Copy the SD card to another card in a USB reader (BETA)
+- **Rescue shell** - Exiting the rescue shell now enters the PINN recovery program instead of another shell.
+- **VNCSHARE** - Sets up PINN to use VNC at the same time as an attached screen
+
+#### Bugfixes
+
+- **https** - Fixed the ability to use https protocol (which was preventing Arch from installing sometimes).
+- **wifi config** - A user supplied wpa_supplicant.conf file is now ALWAYS copied to /settings and then renamed to wpa_supplicant.conf.bak so that it does not continually overwrite any manual changes made through the GUI.
+
+
+### V1.9.2
+
+- **Password** - Change or reset your password for each OS.
+- **DSI/HDMI** - Auto-switching of DSI/HDMI screen with HDMI taking priority
+
+#### BugFixes
+
+- **NoobsConfig** - Config filenames now now have all spaces converted to underscores
+- **Multiple Os** - Multiple installed OSes can now be selected again.
+- **DHCP** - ClientID is now used instead of DUID to request an IP address
+
+
+### V1.9.1 (based on NOOBS v1.9)
+
+- **USB support** - store your OS installations on USB stick to avoid wasting SD card space and avoid downloading each time.
+- **Alternative Src** - Install OSes from an alternative website, or local webserver
+- **ARCH support** - Install the Arch Linux OS directly from the Arch website
+- **VGA666 support** - Alow PINN to be used with Gert's VGA666 adaptor
+- **NOOBSCONFIG support** - Allow customisation of an OS installation as it installs
+- **SSH support** - SSH remotely into you PINN installation.
+- **Progress** - View your installation progress via alternative means
+
+
diff --git a/README_PINN.md b/README_PINN.md
index 74aa8b34d..e5d0d223e 100644
--- a/README_PINN.md
+++ b/README_PINN.md
@@ -7,7 +7,7 @@ The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn
### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
-This README relates to v2.8.5.4
+This README relates to v2.8.5.5
(PINN-lite does not include any operating systems at all. It is more akin to `NOOBS-lite` rather than `NOOBS`. For that reason, the filename that you download is called `pinn-lite.zip`. More recently, `pinn.zip` has also been made available for download which includes versions of Raspbian and LibreELEC.)
@@ -418,7 +418,7 @@ In addition to specifying a list of OS names, some reserved words are also avail
- **showall**: Shows all available installable OSes, whether they are suitable for the current model of Pi or not. Useful for preparing SD cards to be used in other RPis.
-- **bootmenutimeout=\**: Changes the default timeout allowed before an OS is booted without any selection.
+- **bootmenutimeout=\**: Changes the default timeout allowed before an OS is booted without any selection. (If this option is provided with a default sticky OS selected, the menu boot time will be respected, allowing you to choose another OS for this boot only).
- **noobsconfig**: Prevents any noobsconfig customisations from being applied to an OS on installation
@@ -680,7 +680,8 @@ Also a Cancel button (Shortcut=Esc) is provided to boot back into PINN again.
Each OS entry in the boot selection dialog has a checkbox next to it, allowing users to select it as a sticky default OS. If an OS is checked, PINN will operate as if that were the only OS installed (booting it automatically, without showing the boot selection dialog). This permits a slightly faster boot up time when one OS is used regularly.
-To change or remove the sticky checkbox, or just to temporarily boot into another OS, the boot selection dialog can be shown again by pressing the Shift key on boot up and entering the recovery mode.
+To change or remove the sticky checkbox, or just to temporarily boot into another OS, the boot selection dialog can be shown again by pressing the Shift key on boot up and entering the recovery mode. Alternatively, if the cmdline **`bootmenutimeout`** option is specified, the bootmenu will be displayed for this timeout period before booting the selected OS, providing an alternative opportunity to change the OS to be booted.
+
### Reboot shell script
@@ -701,6 +702,10 @@ The is the partition number of the boot partition of the OS y
NOTE: that once an `autoboot.txt` file is present, there's then no way to force the PINN GUI to display, until you delete (or rename) the `autoboot.txt` file. The SD card behaves as if PINN were not there at all.
+## Booting an OS directly from the recovery shell.
+
+The ususal `reboot` command does not work in the PINN recovery shell. However, a new command `rebootp` has been added to allow this. By providing a partition number as an argument, it is possible to boot directly into one of the installed OSes directly. E.G. `reboot 6` will boot direclty into the OS installed in partition 6. There is also `rebootp.sh` which may be better to use from an ssh shell, as it provides a cleaner exit to the ssh terminal.
+
---
# Other Features
diff --git a/README_SUM.md b/README_SUM.md
index b94c24a57..407920888 100644
--- a/README_SUM.md
+++ b/README_SUM.md
@@ -45,6 +45,16 @@ Please note that in some cases it may extract the files into a folder, if this i
## Change History
+## V2.8.5.5
+
+- **Boot menu** - Sticky default now uses bootmenutimeout
+- **rebootp** - Added rebootp command to recovery shell
+
+## V2.8.5.4
+
+- **Boot menu** - Fixed focus and sticky default partuuid issues.
+- **wallpaper_resize** - Customised wallpaper can now be resized to fill the screen
+
## V2.8.5.3
- **Partuuid** - Fixed an issue from v2.8 where partuuids were introduced to installed_os.json
diff --git a/changes.md b/changes.md
index 0721c6766..37c5295c4 100644
--- a/changes.md
+++ b/changes.md
@@ -430,3 +430,8 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
- **Boot menu** - Fixed focus and sticky default partuuid issues.
- **wallpaper_resize** - Customised wallpaper can now be resized to fill the screen
+
+## V2.8.5.5
+
+- **Boot menu** - Sticky default now uses bootmenutimeout
+- **rebootp** - Added rebootp command to recovery shell
diff --git a/history.md b/history.md
index 62e9465c3..e2faa3cc4 100644
--- a/history.md
+++ b/history.md
@@ -5,6 +5,11 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
## Change History
+## V2.8.5.5
+
+- **Boot menu** - Sticky default now uses bootmenutimeout
+- **rebootp** - Added rebootp command to recovery shell
+
## V2.8.5.4
- **Boot menu** - Fixed focus and sticky default partuuid issues.
diff --git a/recovery/config.h b/recovery/config.h
index 339e36330..e3c108004 100644
--- a/recovery/config.h
+++ b/recovery/config.h
@@ -2,7 +2,7 @@
#define CONFIG_H
/* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8.5.4b"
+#define VERSION_NUMBER "2.8.5.5"
/* Color of the background */
// #define BACKGROUND_COLOR Qt::white
diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
index a344e2356..bf746c568 100644
--- a/recovery/translation_ae.ts
+++ b/recovery/translation_ae.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
لا يمكن عرض قائمه الاقلاع
- Error mounting settings partition
خطا في تركيب قسم إعدادات
- HDMI safe mode
HDMI الوضع الأمن
- composite PAL mode
وضع PAL المركب
- composite NTSC mode
وضع NTSC المركب
- PINN - Previously selected OS will boot in %1 seconds
PINN - سيتم اختيار نظام التشغيل المحدد سابقا في %1 ثانية
PINN - Select OS to boot
PINN - حدد نظام التشغيل للاقلاع
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
index 416227de4..39ebbf422 100644
--- a/recovery/translation_ast.ts
+++ b/recovery/translation_ast.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Nun pue amosase'l menú d'arranque
- Error mounting settings partition
Fallu montando la partición d'axustes
- HDMI safe mode
Mou seguru HDMI
- composite PAL mode
Mou compuestu PAL
- composite NTSC mode
mou compuestu NTSC
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
index 18c938b68..fa1c17070 100644
--- a/recovery/translation_ca.ts
+++ b/recovery/translation_ca.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
No es pot visualitzar el menú d'arrencada
- Error mounting settings partition
- HDMI safe mode
mode HDMI segur
- composite PAL mode
mode PAL compost
- composite NTSC mode
mode NTSC compost
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
index a163bf7e5..2a7ae77cb 100644
--- a/recovery/translation_de.ts
+++ b/recovery/translation_de.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Fehler beim Anzeigen des Bootmenüs
- Error mounting settings partition
Fehler beim Einbinden der Einstellungspartition
- HDMI safe mode
HDMI-Modus (sicher)
- composite PAL mode
Composite-PAL-Modus
- composite NTSC mode
Composite-NTSC-Modus
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
index d5725d6f8..0e2ca587a 100644
--- a/recovery/translation_en.ts
+++ b/recovery/translation_en.ts
@@ -5,7 +5,7 @@
BootSelectionDialog
PINN - Select OS to boot
@@ -20,32 +20,32 @@
- Cannot display boot menu
- Error mounting settings partition
- HDMI safe mode
- composite PAL mode
- composite NTSC mode
- PINN - Previously selected OS will boot in %1 seconds
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
index 1c8c8ba5b..b2a0e4b2f 100644
--- a/recovery/translation_es.ts
+++ b/recovery/translation_es.ts
@@ -4,39 +4,39 @@
BootSelectionDialog
- Cannot display boot menu
No se puede mostrar el menú de arranque
- Error mounting settings partition
La partición Settings es la partición con la configuración de PINN
Error al montar la partición Settings
- HDMI safe mode
Modo HDMI seguro (safe)
- composite PAL mode
Modo PAL compuesto
- composite NTSC mode
Modo NTSC compuesto
- PINN - Previously selected OS will boot in %1 seconds
PINN - El SO previamente seleccionado se iniciara en %1 segundos
PINN - Select OS to boot
PINN - Seleccione el SO qué desea iniciar
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
index 09067c8cf..45b2a42ca 100644
--- a/recovery/translation_eu.ts
+++ b/recovery/translation_eu.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Ezin da abioko menua bistaratu
- Error mounting settings partition
Errorea ezarpenen partizioa muntatzean
- HDMI safe mode
HDMI segurua modua
- composite PAL mode
PAL konposatua modua
- composite NTSC mode
NTSC konposatua modua
- PINN - Previously selected OS will boot in %1 seconds
PINN - Aurrez hautatutako SEa %1 segundo barru abiaraziko da
PINN - Select OS to boot
PINN - Hautatu SEa abiarazteko
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
index 512a1dc64..d4c44efa5 100644
--- a/recovery/translation_fi.ts
+++ b/recovery/translation_fi.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
- Error mounting settings partition
- HDMI safe mode
- composite PAL mode
- composite NTSC mode
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
index e5d069f6c..d3ed3568a 100644
--- a/recovery/translation_fr.ts
+++ b/recovery/translation_fr.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Impossible d'afficher le menu de démarrage
- Error mounting settings partition
Erreur pendant le montage de la partition de réglages
- HDMI safe mode
Mode HDMI sans échec
- composite PAL mode
Mode PAL composite
- composite NTSC mode
Mode NTSC composite
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
index cb026cb9c..660bfdb5b 100644
--- a/recovery/translation_hu.ts
+++ b/recovery/translation_hu.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Nem sikerült a boot menü megjelenítése
- Error mounting settings partition
Nem sikerült a beállítások partíció felcsatolása
- HDMI safe mode
Biztonságos HDMI mód
- composite PAL mode
kompozit PAL mód
- composite NTSC mode
kompozit NTSC mód
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
index 801253fe2..31aa0ef2a 100644
--- a/recovery/translation_it.ts
+++ b/recovery/translation_it.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Impossibile visualizzare menu boot
- Error mounting settings partition
Errore montaggio partizione impostazioni
- HDMI safe mode
Modo HDMI sicuro
- composite PAL mode
Modo PAL composito
- composite NTSC mode
Modo NTSC composito
- PINN - Previously selected OS will boot in %1 seconds
PINN - Il sistema operativo precedentemente selezionato si avvierà tra %1 secondi
PINN - Select OS to boot
PINN - Seleziona il SO di avvio
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
index 9d8e9ff94..9e4e91f12 100644
--- a/recovery/translation_ja.ts
+++ b/recovery/translation_ja.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
ブートメニューを表示できません
- Error mounting settings partition
設定パーティションをマウント中のエラー
- HDMI safe mode
HDMI セーフモード
- composite PAL mode
コンポジット PALモード
- composite NTSC mode
コンポジット NTSCモード
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
index 1937ad863..bd657a004 100644
--- a/recovery/translation_ko.ts
+++ b/recovery/translation_ko.ts
@@ -5,7 +5,7 @@
BootSelectionDialog
PINN - Select OS to boot
PINN - 부팅할 OS 선택
@@ -20,32 +20,32 @@
부팅
- Cannot display boot menu
부팅 메뉴를 표시할 수 없음
- Error mounting settings partition
설정 파티선을 마운트하는 과정에서 오류가 발생하였습니다
- HDMI safe mode
HDMI 안전 모드
- composite PAL mode
PAL 영상 출력 모드
- composite NTSC mode
NTSC 영상 출력 모드
- PINN - Previously selected OS will boot in %1 seconds
PINN - %1 초 뒤에 이전에 선택한 OS로 부팅합니다
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
index 77f2d42ae..32f55f94d 100644
--- a/recovery/translation_nl.ts
+++ b/recovery/translation_nl.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Kan opstartmenu niet weergeven
- Error mounting settings partition
Fout bij mounten instellingen partitie
- HDMI safe mode
HDMI safe mode
- composite PAL mode
composite PAL mode
- composite NTSC mode
composite NTSC mode
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
index 98e674b3d..eb0518420 100644
--- a/recovery/translation_no.ts
+++ b/recovery/translation_no.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Kan ikke vise boot-meny
- Error mounting settings partition
Feil ved oppsett av innstillingspartisjon
- HDMI safe mode
HDMI sikker-modus
- composite PAL mode
komposit PAL-modus
- composite NTSC mode
komposit NTSC-modus
- PINN - Previously selected OS will boot in %1 seconds
PINN - Tidligere valgt OS vil boote om %1 sekunder
PINN - Select OS to boot
PINN - Velg OS som skal boote
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
index c9f06dd34..ec6bade8b 100644
--- a/recovery/translation_pl.ts
+++ b/recovery/translation_pl.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Nie można wyświetlić menu uruchamiania
- Error mounting settings partition
Błąd montowania partycji z ustawieniami
- HDMI safe mode
tryb bezpieczny HDMI
- composite PAL mode
tryb composite PAL
- composite NTSC mode
tryb composite NTSC
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
index 801fa7f9b..131f38445 100644
--- a/recovery/translation_pt.ts
+++ b/recovery/translation_pt.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Não é possível exibir o menu de boot
- Error mounting settings partition
Erro ao montar partição de configurações
- HDMI safe mode
Modo HDMI seguro
- composite PAL mode
Modo PAL composto
- composite NTSC mode
Modo NTSC composto
- PINN - Previously selected OS will boot in %1 seconds
PINN - O SO previamente selecionado irá inicializar em %1 segundos
PINN - Select OS to boot
PINN - Selecione o SO para inicializar
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
index e0ff81f06..585debcfc 100644
--- a/recovery/translation_ru.ts
+++ b/recovery/translation_ru.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Невозможно показать меню загрузки
- Error mounting settings partition
Ошибка монтироваия настроек раздела
- HDMI safe mode
Безопасные режим HDMI
- composite PAL mode
Композитный PAL режим
- composite NTSC mode
Композитный NTSC режим
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
index c9ce4e847..0fcf2f1be 100644
--- a/recovery/translation_sv.ts
+++ b/recovery/translation_sv.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Kan inte visa bootmeny
- Error mounting settings partition
Fel vid montering av inställningspartition
- HDMI safe mode
HDMI säkert läge
- composite PAL mode
Kompositvideo PAL-läge
- composite NTSC mode
Kompositvideo NTSC-läge
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
index fd745d547..e67257582 100644
--- a/recovery/translation_tr.ts
+++ b/recovery/translation_tr.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
Boot menüsü görüntülenemiyor
- Error mounting settings partition
Ayar bölümünü bağlamada hata
- HDMI safe mode
HDMI güvenli mod
- composite PAL mode
Kompozit PAL mod
- composite NTSC mode
Kompozit NTSC mod
- PINN - Previously selected OS will boot in %1 seconds
PINN - Select OS to boot
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts
index cd09901de..1e9aed5d3 100644
--- a/recovery/translation_zh_TW.ts
+++ b/recovery/translation_zh_TW.ts
@@ -4,38 +4,38 @@
BootSelectionDialog
- Cannot display boot menu
無法顯示開機選單
- Error mounting settings partition
掛載 settings 分割區時發生錯誤
- HDMI safe mode
HDMI 安全模式
- composite PAL mode
合成 PAL 模式
- composite NTSC mode
合成 NTSC 模式
- PINN - Previously selected OS will boot in %1 seconds
PINN - 先前選擇的作業系統將會在 %1 秒內啟動
PINN - Select OS to boot
PINN - 選取要啟動的作業系統