diff --git a/README_PINN.md b/README_PINN.md
index be250e0e..3b8152f3 100644
--- a/README_PINN.md
+++ b/README_PINN.md
@@ -1,1243 +1,1249 @@
-
-# What is PINN (PINN Is Not NOOBS)?
-
-**An easy enhanced Operating System installer for the Raspberry Pi**
-
-The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip) can be downloaded from [sourceforge](http://www.sourceforge.net/projects/pinn).
-
-This README relates to v3.2.3
-
-(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.)
-
-## Index
-
-* [Quick Start](#quick-start)
-* [PINN User Interface](#pinn-user-interface)
-* [PINN Configuration](#pinn-configuration)
-* [Installing OSes](#installing-oses)
-* [Booting an OS with PINN](#booting-an-os-with-pinn)
-* [Other Features](#other-features)
-* [Archival Menu](#archival-menu)
-* [Maintenance Menu](#maintenance-menu)
-* [Advanced Usage](#advanced-usage)
-* [Troubleshooting](#troubleshooting)
-* [FAQ](#faq)
-* [How to Rebuild PINN](#how-to-rebuild-pinn)
-
-# Introduction
-
-## Features
-- A multi Operating System (OS) installer
-- An operating system selector
-- A boot manager
-- An OS maintenance utility:
- - Backup and Restore OSes
- - A recovery shell
- - SD card clone utility
- - Password restorer
- - File System Checker
-
-
-
-*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 the installation sources.
-
-## Benefits
-
-PINN 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.
-
-Once PINN is installed on your SD card, the installation of other OSes and a lot of the maintenance of them can mostly be done on the RPi itself without having to remove the SD card.
-
-The list of OSes that can be installed by PINN is growing all the time, from general purpose Linux distros, through educational versions, media centres to retro gaming solutions. It is the ideal environment to experiment and try out new OSes.
-
-PINN occupies just over 60MB of your precious SD card space, leaving the majority of the card available for your OSes.
-
-### General Operation
-
-On first boot, PINN 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 locally available OSes (i.e. those contained in the `/os` directory on disk or an attached USB memory stick) and those available from a remote repository (network connection required).
-
-Only the latest version of each OS will ever be displayed. So, you can be sure that you have installed the most up-to-date release of your selected OS.
-
-On any subsequent boot, you can press the SHIFT key to enter the PINN interface and easily reinstall your choice of OSes. It is also possible to press the Left mouse button, press any key on a CEC enabled TV remote, or touch the Raspberry logo on the touchscreen to enter the PINN interface.
-
-If no input is provided, PINN will proceed to the boot selection dialog. If only one OS installed it will booted immediately, otherwise a menu of installed OSes will be presented for one to be selected. If no choice is detected within a timeout period, the last booted OS, or a default OS will be chosen.
-
-It is also possible for PINN to be bypassed altogether and one of the OSes booted directly from startup. In this way it is not even noticeable that PINN is there, but it can be reinstated simply by deleting a single file on the PINN partition.
-
-## Requirements
-
-- A Raspberry Pi with power supply (works with all models)
-- A blank micro SD card (or SD card for an earlier Model 1 RPi). 8GB is the minimum recommended size. 16GB or larger is preferred, especially if you want to install locally from the SD card.
-- (optional) A keyboard and mouse (unless you want to use it headlessly).
-- (recommended) A network connection (unless you want to install OSes from a local source, but you'll need to download them somehow first!).
-- (recommended) A USB uSD card reader is not required, but it is an essential bit of kit to allow a PC to format the uSD card, install PINN initially and general editing if something goes wrong.
-- Access to NOOBS formatted OS distributions (via Internet or local memory device).
-- [pinn-lite.zip](http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip).
-
----
-# Quick Start
-
-The following Quick Start instructions detail the most common and quickest way to start using PINN. For more details on the other features that PINN provides, please continue reading the rest of this document.
-
-## 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.) **In some cases, the files may be extracted into a folder. If this is the case, please copy the files from inside the folder rather than copying the folder itself.**
-
-## Using Etcher
-
-An alternative to unzipping the pinn-lite.zip file to a FAT32 formatted drive is to use the popular Etcher program
-to burn an image directly to the SD card.
-
-The [pinn-lite.img.zip](http://sourceforge.net/projects/pinn/files/Etcher/pinn-lite.img.zip) image file you need to burn can be found on [sourceforge](http://www.sourceforge.net/projects/pinn) in the Etcher folder.
-
-## 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.
-
-## Self Update
-
-If PINN is connected to the Internet, it will check for the latest version available for download from the recovery main menu. If a newer version is available, a dialog box will pop up, showing the latest version number and the recent changes. You then have the option to cancel the update, download it, or ignore this version.
-
-If you cancel the update, the dialog box will keep popping up to remind you each time PINN starts.
-
-If you select "ignore", this version will be ignored and no dialogs will pop up again until another later version is released.
-
-If you choose to download this update, the zip file will be downloaded and will overwrite your current version of PINN. PINN will then reboot the RPi and restart PINN.
-
-It is possible to disable self-update checks by adding the `no_update` option to `recovery.cmdline`. In this case you will have to delete this option to enable self-updates again. Or you can manually check for updates at any time by choosing to `reinstall` the PINN item in the archival menu, but it must be the only item selected.
-
-You can force new updates to be automatically installed without user interaction by adding the `forceupdatepinn` to `recovery.cmdline`.
-
----
-
-# PINN User Interface
-
-The PINN user interface is kept fairly simple, comprising a switchable toolbar of command buttons, a list of installable operating systems and a status window indicating the capacity of appropriate attached memory devices. At the bottom of the screen is a small display customisation dialog that permits changing the language and keyboard layout of the user interface. The model of RPi you are using is also displayed just above this,
-
-
-
-## Toolbars
-
-There are three toolbars:
-
-- **[Main Menu](#main-os-list-window)**
- - **[Install](#installing-oses)**: Installs the selected OSes onto your SD card. Changing this selection erases all OSes that are currently installed.
- - **[Wifi](#wireless-wifi-networks)**: configures the wifi.
- - **[Help](#online-help-via-web-browser)**: [Networking Required] Opens a browser that displays the Raspberry Pi Help page (http://www.raspberrypi.org/help/), allowing people to quickly access help and troubleshooting information.
- - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
- - **[Clear](#clear)**: Clears all selected OSes from the available and installed OS lists.
- - **[Exit](#exit)**: Quits PINN and reboots the Pi into the OS boot menu.
-- **[Archival](#archival-menu)**
- - **[Download](#download)**: Downloads an OS for offline installation.
- - **[Clone SD](#how-to-clone-an-sd-card)**: Clones the SD to another card.
- - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
- - **[Firmware](#pinns-firmware-upgradedowngrade)**: Upgrades or downgrades PINN's firmware for use on RPI3B+ or other models.
- - **[Time](#set-time)**: Sets the current time.
-- **[Maintenance](#maintenance-menu)**
- - **[Edit Config](#easy-config-file-editor)**: Opens a text editor, allowing the `cmdline` and `config` files for the selected installed OS to be edited.
- - **[Password](#how-to-recover-from-a-lost-password)**: Allows the password of an OS to be restored or replaced.
- - **[Backup](#backup)**: Backup Operating Systems.
- - **[Fix](#how-to-fix-an-os)**: Performs repairs on file systems of the selected installed OSes.
- - **[Reinstall](#reinstall-individual-oses)**: Allows individual installed OSes to be reinstalled back to their original installation without affecting any of the other installed OSes.
- - **[Replace](#replace-individual-oses)**: Allows individual installed OSes to be replaced by other/different OSes without affecting any of the other installed OSes.
- - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
- - **[Alias](#alias)**: Renames an installed OS by assigning it an alias.
-
-The `more` button can be used to cycle through the 3 toolbars. (shortcuts = M)
-
-## Main OS List Window
-
-Beneath the toolbar is the main list of Operating Systems which displays the name and a short description of each OS. At the right hand side is an icon indicating the source where the latest version will be installed from (Internet, SD card or USB drive).
-
-OSes are grouped onto tabs which categorise the type of OS they are. This grouping includes the following categories: General, Media, Gaming, Education, Minimal & Utility. To avoid this grouping, specify **`no_group`** on recovery.cmdline and the OSes will all appear in one list.
-
-Each OS has a checkbox at the left hand side to select whether it will be installed or not. When PINN is booted with OSes already installed, these OSes will normally have their checkbox automatically ticked (but see the `select` option) and their background will also be light green in colour, along with the word **[installed]** next to their name. Note that installed OSes may be selected in multiple tabs.
-
-When the **Maintenance** toolbar is selected, this list will change to only show the list of OSes that are already installed, since the toolbar buttons are only relevent to installed OSes.
-
-## Status Window
-
-Below the main OS List Window is a status window indicating the capacity of appropriate attached memory devices.
-
-On the **Main Menu**, this status window will show the space on the SD card that is available to install OSes, along with the amount of required space for the selected OSes. If a USB drive is inserted, a drop down selection box will appear to change the install device from the SD card to the USB device. You will be prompted to format the USB drive if it is not already formatted in the correct way for a PINN installation. The model of RPi you are using is shown in the bottom right corner of this status window.
-
-On the **Archival** menu, this status window will change to show the amount of available and required space on the USB drive for downloading OSes to. Such a USB drive will only be selectable if it has an /os folder on its first partition to store OSes on.
-
-On the **Maintenance** menu, this status window will not appear.
-
-## Display Customisation
-
-In addition to the toolbars, the following functionality is provided:
- - Language Selection : Allows you to select the language used for text display.
- - Keyboard Layout Selection : Allows you to select the keyboard layout to be used.
- - Display Mode Selection : By default, PINN 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 (1), HDMI safe mode (2), composite PAL mode (3), or composite NTSC mode (4), respectively.
- - Background colour : To change the background colour for the screen and most windows, add `background=r,g,b` to recovery.cmdline, where 0,0,0 is black and 255,255,255 is white.
- - style : The style of the windows display can be modified by adding `style=motif/windows/platinum` to recovery.cmdline
- - Wallpaper : The background wallpaper of PINN can be changed by adding your own `wallpaper.jpg` or `wallpaper.png` file to PINN's recovery partition.
- - wallpaper_resize : A custom wallpaper can be resized to fill the entire desktop by adding this option.
-
-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 PINN interface on your display device, you should be able to see the OS CLI/GUI when it boots too.
-
-## User Control
-
-### Mouse & Keyboard
-
-If you are using the RPi locally, the majority of the program can be used with a mouse alone, although a keyboard can make it easier. A keyboard is required to enter the wifi credentials if you want to connect to a network that way. However, the wifi can be preconfigured to avoid even this use.
-
-### CEC Control
-
-PINN can be controlled with a TV remote, if the HDMI TV has CEC support.
-The default CEC remote keys are mapped as follows:
-
-To simulate a mouse the following keys are used:
-- Cursor Up/Down/Left/Right - moves the mouse cursor in each direction
-- Select - mouse click
-
-For quicker selection, the following keys may be easier if supported by your model of TV:
-- Channel Up - previous list item
-- Channel Down - next list item
-- PLAY key - Enter Key
-- Exit Key - Escape
-- 9 key - Changes the toolbar
-- 1-8 keys - select the menu buttons numbered from left to right
-
-Any of the above remote keys can be used instead of the keyboard shift key on startup to access the main menu.
-
-There is no onscreen keyboard in PINN, so a local keyboard will be needed to enter wifi credentials, unless the wifi is preconfigured.
-
-**NOTE: CEC implementations vary between TV manufacturers. The above key mappings work on Samsung TVs supporting their Anynet+. Other TV brands may not work as well, but the mouse simulation is designed to work on most TVs.**
-
-It is possible to program your own set of key mappings for your particular remote.
-To do this you should create a `cec_keys.json` file.
-See the [cec_keys.md](cec_keys.md) document on how to do this.
-The default mappings are listed in the [wiki](https://github.com/procount/pinn/wiki/Default-CEC-Key-mappings-for-cec_keys.json).
-
-### How to use with the Raspberry Pi Touch Display
-
-If PINN 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 touchscreen on the Raspberry logo (or holding down the shift key) can activate PINN.
-- A tap on the touchscreen will simulate a mouse click.
-- A long press on the touchscreen will simulate a mouse double-click.
-
-There is no onscreen keyboard in PINN, so a local keyboard will be needed to enter wifi credentials, unless the wifi is preconfigured.
-
-### How to use with Gert's VGA666 DPI display screen
-
-The VGA666 adaptor connects to the GPIO pins and allows a VGA display to be attached to the RPi. The normal VGA666 installation instructions should be followed to allow it to work with PINN.
-
-Create a config.txt file with the following lines in it:
-```
-dtoverlay=VGA666
-enable_dpi_lcd=1
-display_default_lcd=1
-dpi_group= (e.g. dpi_group=1, or dpi_group=2)
-dpi_mode= (e.g. dpi_mode=28 - see tvservice for a list of possible modes)
-```
-In addition, the `recovery.cmdline` file should have `disablesafemode` added as a parameter. Without it, the VGA666 will force PINN into safe mode, due to its connections to the GPIO header.
-
-Remember to also enable the display in each OS that you want to use it with.
-
-### How to use with Pimoroni's Hyperpixel displays
-
-Support for Pimoroni's original Hyperpixel and the Hyperpixel4 displays has now been built into PINN in the form of new composite kernel drivers. These provide screen detection, LCD initialisation and touchscreen support for both screens.
-
-To enable support for these screens add the appropriate dtoverlay to your config.txt file. The supported parameters are provided below:
-
-Name: pimhyp3
-Info: Overlay for activation of Pimoroni Hyperpixel 3.5"
-Load: dtoverlay=pimhyp3,]
-Params: rotate or rotate_0 Default orientation (landscape)
- rotate_1 Rotate 90 degrees CW (portrait)
- rotate_2 Rotate 180 degrees (landscape)
- rotate_3 Rotate 180 degrees (landscape)
- checkonly Checks for presence of screen but does not load driver
- poll Uses polling instead of interrupts for Touchscreen
- refresh-rate= Sets the refresh rate for polling mode in ms.
-
-Name: pimhyp4
-Info: Overlay for activation of Pimoroni Hyperpixel 4"
-Load: dtoverlay=pimhyp4,]
-Params: rotate or rotate_0 Default orientation (portrait)
- rotate_1 Rotate 90 degrees CW (landscape)
- rotate_2 Rotate 180 degrees (portrait)
- rotate_3 Rotate 270 degrees (landscap)
- checkonly Checks for presence of screen but does not load driver
-
-To rotate the screens, add `display_lcd_rotate=0` to config.txt.
-Replace the `0` with 1,2 or 3 for the various rotations.
-To rotate the touchscreen add the appopriate dtparam to the overlay, e.g. `dtoverlay=pimhyp4:rotate_0`
-For some rotations, it may also be necessary to set the `framebuffer_width` and `framebuffer_height` parameters.
-
-Example config.txt files called config.hyp3 and config.hyp4 are included with example settings for each of the 4 rotations.
-
-Remember to also enable the display in each OS that you want to use it with.
-
-### How to use PINN Headlessly (VNC)
-
-It is possible to access PINN without a keyboard and mouse using VNC over a network.
-
-Append `vncinstall` to the argument list in the `recovery.cmdline` file which is found in the root PINN directory. Using `forcetrigger` in addition can be useful as it is not always easy to connect quickly enough to see the splash screen and hold the shift key remotely. This will force you to use VNC to continue the boot process into your installed OS on each boot, so it is best to remove `forcetrigger` once the required OS's have been installed. Alternatively you could use `gpiotriggerenable` (see later).
-
-To connect over VNC, you need to know the IP address of the Pi. If you are using DHCP, then you should see your router for a list of the devices connected to it and the IP addresses that have been assigned, or use an IP scanner like Fing to identify your device. If you have a monitor attached and are using `vncshare`, the IP address of the PI is shown in the window title bar for ease of connection. Connect to port 5900 of this IP address. Using tightvnc, you need to specify this as :5900 e.g. 192.168.1.0:5900.
-
-When VNC is selected, there will be no GUI present on any attached display, as all output is redirected over the VNC network connection. Alternatively, appending `vncshare` to the argument list instead of `vncinstall` will share the screen between the locally attached display and redirect it over the VNC network connection simultaneously.
-
-NOTE 1: These VNC options are meant to be used on a local LAN only. If your Pi is open to the internet, **anyone** can gain access to PINN as there is no security.
-
-Note 2: The `remotetimeout` option is useful to gain remote access within a timeout period, yet, allowing the default boot operation to continue.
-
-### How to access the shell or SSH into PINN
-
-1. Once the PINN GUI is launched, the busybox shell can be accessed by pressing CTRL-ALT-F2. Use the Username of `root` and password of `raspberry`. Use CTL-ALT-F1 to get back to the GUI. This can be useful for editing recovery.cmdline locally or performing other maintenance tasks on your SD card.
-
-2. You can also SSH into the PINN basic busybox shell. To enable this feature, add `ssh` to the argument list in the `recovery.cmdline` file. SSH is also accessible from the rescueshell, but allow 5 seconds after boot to allow the network to establish. PINN SSH does not store any keys, so it takes a while to connect at first after each boot as it generates new keys for that session.
-
-The IP address of the PI is shown in the window title bar for ease of connection.
-
-Use the username of `root` and password `raspberry` to login to the shell via the console or SSH.
-
-NOTE: This SSH option is meant to be used on a local LAN only. If your Pi is open to the internet, **anyone** can gain access to PINN as the only security is a well-known username/password.
-
-### Shell editors
-
-Two editors are available in the recovery shell: vi and nano. Only the Tiny version of nano is included, so some features may not be present when compared to the version supplied with Raspbian.
-
-### How to change display output modes
-
-By default, PINN 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 (1), HDMI safe mode (2), composite PAL mode (3), or composite NTSC mode (4), respectively.
-
-If you don't have a keyboard, you can still change the display mode used by PINN through editing the `recovery.cmdline` file in the root PINN directory prior to first boot and appending the following argument:
-- `display=` (e.g. `display=1` or `display=3`)
-
----
-
-# PINN Configuration
-
-## Network Connection
-
-To get the best out of PINN it is important that it has access to the internet in order to keep itself updated and ensure it has access to the latest version of each OS. Connecting to a switch or router with an ethernet cable is the easiest way to get it online. Wifi support is enabled for all built-in wifi chips and many popular wifi dongles, but it requires a little more setup to connect to the correct wifi network.
-
-PINN will also work in offline mode to install OSes from a USB memory device, or even from the SD card itself. This is useful at locations where network access is not assured, for example at Raspberry Jams or schools, but the OS installation files still need to be downloaded from the internet at some point and kept up to date.
-
-### Wired Networks
-
-If a wired ethernet cable is plugged into the Pi before PINN starts, PINN will connect to your DHCP enabled router. This is the easiest way to access the Internet as it requires no configuration. PINN will connect to a remote download repository and present a list of available operating systems that are available for installation.
-
-### Wireless Wifi Networks
-
-If you have the official [Rapberry Pi USB wifi Dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/), or are using the Raspberry Pi 3 Model B/B+ or Pi0W with built-in Wi-Fi, the Wi-Fi icon on the PINN toolbar will be available. Click on this to select your Wi-Fi SSID network and enter the Wi-Fi password. If the password is correct, you will soon be connected to the Internet and PINN will present a list of downloadable operating systems for you to install.
-
-
-
-PINN will remember your wifi network connections, so it is only necessary to enter them once. Some operating systems, like Raspbian, will copy these wifi connections when they install, so they will also be able to use them as soon as they are booted.
-
-### Preconfiguring a WiFi network
-
-If you already know your WiFi details, you can preconfigure PINN to use them straight away. Put a copy of your `wpa_supplicant.conf` file on the PINN root partition and PINN will read it and store it in its settings for all future uses. The file will be renamed to `wpa_supplicant.conf.bak` to prevent it from overwriting any subsequent changes you make to the Wi-Fi networks using the GUI. This file will also be passed on to some OSes when they install.
-
-If you need to have more control over your network connection, like setting a static IP address, it is also possible to drop a new copy of the dhcpcd.conf file onto the PINN root partition and PINN will read it and store it in its settings for all future uses. The file will be renamed to `dhcpcd.conf.bak` after being copied.
-
-### Network Drivers
-
-From v1.9.4, the following network drivers have been added to support a wider range of Wi-Fi and network adapters:
-* zd1211rw
-* rtl8192cu - fixed in v1.9.5
-* rt2500usb
-* rt73usb
-* rt2800usb
-* mt7601u
-* rtl8150
-* r8152
-* asix
-* ax88179_178a
-* dm9601
-* smsc95xx
-
-from v2.0
-* rtl8188eu - for hubpiwi and others
-from v2.1
-* IoTpHAT
-from 2.4.5f
-* rtl8812
-
-NOTE: Realtek wifi drivers (rtl8188eu, rtl8812au, rtl8192cu) are not present in v2.5.1.
-
-### Enabling SSH for Raspbian
-
-In recent Raspbian releases, SSH has been disabled by default for security reasons. To override this and enable SSH from first boot, it is necessary to create a file called `ssh` or `ssh.txt` in the Raspbian boot partition. If PINN detects such a file in the PINN recovery partition, it will copy it across to the Raspbian boot partition whenever it is installed, enabling SSH to be enabled immediately, which is very useful especially for headless installs.
-
-NOTE: this file does not enable SSH access to PINN. To enable that the 'ssh' keyword must be added to `recovery.cmdline`.
-
-### How to change the default Language, Keyboard layout, Display mode, or Boot Partition etc.
-
-Edit the `recovery.cmdline` file in the root PINN 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.
-
-## Cmdline Options
-
-The following is a complete list of all the PINN options that can be added to the `recovery.cmdline` file on the PINN recovery partition to affect its operation:
-
-- **runinstaller**: This option is present when PINN is first installed to cause it to reformat the SD card. Once reformatted, PINN will delete this option. Manually adding it back in will cause PINN to reformat the SD card on next boot, losing any and all installed OSes, so be careful!
-
-- **reserve=(+)NNN**: This option will reserve a set amount of space for PINN's partition (typically /dev/mmcblk0p1) when the `runinstaller` option first formats the SD card. This space may be useful for adding OS install files later, or for using the first partition as a transfer area for data between the RPi and a Windows PC that can only read the SD card's first partition. NNN specifies the total size of this partition in MB. The default value is around 64MB. If the size is prefixed with a '+' sign, the value indicates an amount of disk space to be reserved [i]in addition[/i] to the size of PINN's files. So, `reserve=200` will make P1 200MB in size and `reserve=+200` will make it about 263MB in size.
-
-- **no_update**: Prevents PINN from performing a self-update check on boot up. Use the `reinstall` option to manually check for updates on PINN.
-
-- **forceupdatepinn** - Forces a PINN self update if one exists, without user interaction.
-
-- **nofirmware**: Prevents PINN from upgrading the firmware of old OSes to be compatible with PINN.
-
-- **vncinstall**: Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
-- **vncshare**: Uses a VNC network connection to control PINN. However, unlike `vncinstall`, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
-
-- **ssh**: Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions.
-
-- **rescueshell**: This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal. Alternatively, inserting a physical jumper between pins 5 & 6 of GPIO header P1 will cause the rescueshell to be entered as well.
-
-- **lang=\**: Sets the language to be used by PINN
-
-- **keyboard=\**: Sets the keyboard code to be used by PINN
-
-- **display=\<1|2|3|4\>**: Sets one of 4 simple display modes
-
-- **partition=\**: Sets the default partition to be booted if no input is detected.
-
-- **forcetrigger**: Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
-
-- **gpiotriggerenable**: Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
-
-- **keyboardtriggerdisable**: Prevents a `SHIFT` keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
-
-- **remotetimeout=\**: When used in conjunction with `forcetrigger` it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot. This permits normal default OS booting, yet also allows for a remote user to interrupt the startup process to change the OS to boot, or perform any remote maintenance. Any screen interaction over VNC will cancel the timeout. This additional timeout will lengthen the boot time into a default OS, so choose a value that is long enough to allow VNC access, yet short enough not to be annoying under normal circumstances.
-
-- **networktimeout=\**: PINN will wait for a default timeout of 8 seconds to detect whether a network is connected or not. (This is extended by an additional 4 seconds if wifi is configured). This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish. Setting a value of 0 will disable the "Please wait while PINN initialises" progress box and will wait indefinitely for the network before installing any required OSes.
-
-- **disablesafemode**: 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" by entering the rescueshell. To prevent this, you can append `disablesafemode` to the `recovery.cmdline` file.
-
-- **silentinstall**: Allows a single or multiple OSes to be installed automatically, useful during headless installs. See [How to Automatically Install OSes](#how-to-automatically-install-oses)
-
-- **select=\**: Auto-selects a number of OSes or OS sources to be installed. When used in conjunction with `silentinstall`, the OSes are automatically installed without any user intervention. See [How to Automatically Install OSes](#how-to-automatically-install-oses).
-In addition to specifying a list of OS names, some reserved words are also available to specify different sources of OSes instead, or to control when they are installed.
- - `allinstalled` - Normally, all installed OSes are automatically selected, but they are not selected when the "select" option is present. Adding 'allinstalled' will ensure they are selected again.
- - `allsd` - Selects all OSes where the most recent one is on the SD card
- - `allusb` - Selects all OSes where the most recent one is on a local USB drive
- - `allnetwork` - Selects all OSes where the most recent one is on remote repositories.
- - `waitnetwork` - Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- - `waitusb` - Waits for all OSes on local USBs to be listed
- - `waitsd` - Waits for all OSes on the SD card to be listed
- - `waitall` - Waits for OSes from all sources to be listed
-
-- **silentreinstallnewer**: This is an advanced option and potentially _**Destructive to your data!**_. Do not use unless you are fully aware of its consequences. See [Auto-Reinstalling OSes](#auto-reinstalling-oses)
-
-- **alt_image_source=\**: Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
-
-- **repo_list=\**: Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet respositories.
-
-- **repo=\**: Similar to `alt_image_source` but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
-
-- **no_default_source**: Prevents the default RaspberryPi Foundation repository from being used.
-
-- **disableusbimages**: Prevents OSes stored on local USB memory devices from being used.
-
-- **disablesdimages**: Prevent OSes stored on the SD card from being used.
-
-- **no_group**: Prevents the list of OSes from being grouped into categories.
-
-- **no_cursor**: Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
-
-- **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. (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
-
-- **configpath=**: Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/\/)
-
-- **background=\**: To change the background colour for the screen and most windows, add `background=r,g,b`, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
-
-- **wallpaper_resize**: Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop. As an alternative to 'background', a small (8x8) png file can be used to fill the desktop only with a particular colour, leaving the background of the other windows alone.
-
-- **style=**: The style of the windows display can be modified to one of `motif`, `windows` or `platinum`
-
-
-
-- **dsi**: A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
-
-
-The recovery.cmdline can be edited using the [Edit Config](#easy-config-file-editor) option on the maintenance menu. From v3.2, this now includes an Edit Options button which launches a dialog to set all the options more easily using simpler checkboxes.
-
----
-
-# Installing OSes
-
-## OS Installation
-
-Simply select the checkbox next to each OS you want to install, using either a mouse or keyboard (use the arrow keys to traverse the list; the Enter or Space key 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), USB device (USB icon) or from the online OS repository (Ethernet icon).
-
-_Some OSes may require some terms and conditions to be accepted before the OS can be installed._
-
-
-
-*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 the installation sources.
-
-### File Signatures and Checksums
-
-OS maintainers have the option of providing signatures or checksums for their main OS tarballs/images and their partition_setup.sh script. These may be of type sha512sum, sha256sum, sha1sum or md5sum. When PINN sees such a signature it will verify the downloaded file against its signature for correctness and an error will result if they differ.
-
-When a checksum error occurs during installation, 4 options are available:
-
-- **keep** - Keep the current file and continue, but the OS will be marked as non-bootable
-- **retry** - retry the file again
-- **discard** - discard this file, but continue with any other OSes
-- **abort** - Abort all OSes
-
-When OSes are installed, the checksums are calculated during the installation, but for downloads and backups they are calculated at the end.
-
-Checksums can be found in each partition section of the `partitions.json` file for tarballs, and in `os.json` for the `partition_setup.sh` script.
-
-The keys: "sha512sum", "sha256sum", "sha1sum" and "md5sum" indicate the type of the checksum and its value is the checksum expressed as a quoted Hex string. Alternatively, the checksum value can be the URL of a standard digest file, being the captured output of one of these checksum programs.
-
-## OS Network Installation
-
-PINN allows additional operating systems to be downloaded from a remote repository. To do this, the Raspberry Pi must be connected to a wired network, or it can connect over Wi-Fi using the [Raspberry Pi USB wifi dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/) or the Raspberry Pi 3 Model B built-in Wi-Fi.
-
-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 PINN directory and append `showall` to the arguments list.
-
-Once PINN has connected to your network, the IP address of the PI is shown in the window title bar.
-
-### How to install OSes from an alternative network sources
-
-If your Pi is connected to the Internet, PINN will present a list of OSes that are available for installation from the internet. By default, this list includes all of those available through the Raspberry Pi website, plus some others that have been converted specifically for PINN through the repo_list cmdline option.
-
-PINN provides many options to customise the list of repositories that it will use for sources of OSes by using the following recovery.cmdline options:
-
-- If no specific cmdline option is given, PINN will use the list on the Raspberry Pi Website.
-
-- **no_default_source** will prevent the OSes on the Raspberry pi website from being used.
-
-- **alt_image_source=** specifies an alternative source of OSes that can be installed from the internet. For example: alt_image_source=http://newurl.com/os_list_v3.json where `newurl.com` is the name of the alternative server and `os_list_v3.json` is the list of information about the alternative OSes. This list of OSes will be added to the default download list. This can be useful for storing the default repository on a local LAN server, or for adding your own list of OSes to those available in PINN. Multiple alternative repositories can be specified by including this option multiple times with different URLs.
-
-- **repo=** option from NOOBS is supported by PINN. Using `repo` will replace the default RPF server repository, whereas `alt_image_source` simply adds a repository. To add multiple repositories add multiple space-separated urls to the single "quoted" repo option.
-
-- **repo_list=** is used by default as it is a convenient way to support multiple repsositories by specifying one URL that points to a JSON file containing a list of other repositories. This makes it easier to maintain the OS list remotely for a set of users, rather than editing it manually on each Pi. For testing purposes, including a `repo_list.json` file on the PINN recovery partition will override any cmdline option and will be read instead.
-
-## Local Images on SD card
-
-PINN can install local images that are found in the `/os` folder on the SD card. These can include any of the original NOOBS images or any other OS that is formatted with a `.tar.xz` file for each partition.
-
-Whilst this can be a convenient way to host the installable images as they can be installed offline, it does take up some valuable SD card space, so installing from USB is often better.
-
-The easiest way to put OS installation images on the SD card is to first [download](#download) them to a USB stick and then copy the appropriate folder from the USB drive to the SD card.
-
-Make sure to add any OSes to the `/os/` folder before you boot PINN in a RPi for the first time. Otherwise you will find the partition has been shrunk to its minimum size and there will be no room to add any more OSes to the card later. However, by adding the `reserve=` option, it is now possible to reserve some free space on PINN's 1st FAT partition for storing OS images on later, or for general transfer of data to/from a Windows PC.
-
-## Local Images on USB stick
-
-Due to the increasing size of OSes, it is becoming increasingly difficult to store their compressed installation files on the PINN SD card. PINN-lite contains no OS installation files by default, but you can copy selected OSes into the `/os` folder if you wish.
-
-To counter this lack of SD card space, PINN supports storing the compressed OSes on a USB stick as well. This has the following advantages:
-
- 1. The OSes are available to install when a network is not available.
- 2. They do not take up any valuable space on the SD card.
-
-The OSes should be stored on the USB stick in the same format as they would be on a PINN SD card (please see the [download](#download) section):
-
- 1. Each OS should be stored in its own folder beneath the `/os` folder.
- 2. They should contain compressed images of their partitions in `.tar.xz` format
- 3. All supporting JSON files (etc.) should also be included.
-
-If the same OS is available on the SD card, the USB stick, and the network, only the most recent version will be displayed.
-
-## Installing TO a USB device
-
-There are three ways for PINN to install an OS, which also depends on the RPi model you have:
-
-1. Install to the SD card
-2. Install the boot partition to the SD card and the rootfs to the USB device
-3. Install the boot and rootfs partitions to the USB device.
-
-_NOTE: PINN can only install the boot partition of an OS to the same drive that PINN is stored on. So for option 3, the USB drive must have PINN installed on it and the Pi must be booted from this drive._
-
-### Option 1: Install to the SD card
-
-This is the normal way to use PINN. PINN is stored on the SD card, is booted and installs the OSes to the remainder of the space on the SD card.
-
-### Option 2: Boot on SD card, Rootfs on USB
-
-There are several reasons why you may want to install an OS to a USB memory device: more capacity, more resilience, faster read/write operation and so on. PINN allows the rootfs to be installed to a USB memory device. However, the boot partition is kept on the SD card, so this technique is applicable to all RPi models.
-
-1. Follow the basic instructions to format your SD card and install PINN on it.
-2. Boot your Pi with the PINN SD card.
-3. Insert a USB memory device (USB stick, hard disk etc) into the Pi). Make sure it has nothing of value on it because it will be erased and reformatted.
-4. Select the new USB device in the dropdown box in the lower status window as the drive to install to and you will be prompted to format the device. Select Yes to continue.
-5. Install the OSes you require as normal.
-
-Using this technique you will always need to boot from the PINN SD card.
-
-### Option 3: Boot and Rootfs on USB
-
-This option is only applicable to RPi models based on the BCM2837 chipset (RPi3B and RPi2Bv1.2) which have the facility to boot directly from a USB device. However this mode must be enabled first, which can be done by following the instructions at: https://github.com/raspberrypi/documentation/blob/master/hardware/raspberrypi/bootmodes/msd.md
-
-Once USB boot mode is enabled, proceed as follows:
-
-1. Format the USB device as FAT 32 and copy the PINN files to it, just as you would for a normal PINN installation on an SD card.
-2. Boot PINN on the Pi from the USB device.
-3. Install your requried OSes as normal.
-
-## Project Spaces
-
-Project Spaces are empty OSes that just consist of an empty 100MB FAT32 partition and an empty 500MB nominal ext4 partition. Up to 8 Project Spaces can be installed onto an SD card along with any other OSes. Any remaining space left on the SD card will be divided up between all of these Project Spaces, so their ext4 partitions will expand to fill the remaining space and they will all be the same size.
-
-
-
-
-Project Spaces are useful when used with the [Replace](#replace-individual-os) OS function, as they reserve OS space that can be used later. The 3 main benefits are:
-1. They reserve OS space, so the choice of which OS to install or add can be made later on.
-2. They allow multiple instances of the same OS to be installed.
-3. They allow the same amount of space to be used for each OS.
-
-When replacing a project space with another OS, remember that the new OS must have the same number of partitions as the project space and each partition must fit within the existing partition sizes. So creating 8 project spaces on a 16GB card may not be very useful as there will be <2GB left on each of the ext4 partitions. That maybe ok for some of the minimal OSes, but no good for a full Raspbian installation, for example.
-
-## PINN's Firmware Upgrade/Downgrade
-
-PINN v2.5.3+ includes new firmware, kernel and drivers to support the new Pi3B+ model. Whilst this firmware will allow PINN to run on all RPi models, some older OSes may not yet be compatible
-and will not boot from PINN. So when booting on models older than the 3B+, PINN's firmware can be downgraded so that these older OSes can still boot from PINN.
-On first startup on an older RPi model, PINN will automatically downgrade the firmware. It will need upgrading manually if you want to use the latest firmware.
-
-Once PINN's firmware has been downgraded, it will no longer run on the RPi3B+. To run it on a RPI3B+ again it is first necessary to upgrade the firmware on an older model.
-There is a menu item on the Archival menu to upgrade or downgrade PINN's firmware accordingly. it is disabled on the RPi 3B+
-
-## OS firmware upgrade
-
-When PINN is running on upgraded firmware for the RPI3B+, it will try to upgrade the firmware of any OS that is installed, if it is too old to run on the RPi3B+.
-This may allow the OS to boot, but the Ethernet, wifi and USB may not work unless the drivers for these devices are upgraded.
-If this is not required, the `nofirmware` option can be used to prevent the firmware from being upgraded.
-This firmware upgrade feature is disabled when downgraded firmware is in use.
-
-Many OSes that support the Pi3 will need updating to support the new Pi3B+ model, so the list of available OSes for this Pi3B+ may be limited for a while. Adding the `showall` option may allow them
-to be selected, and PINN's new firmware upgrade feature may allow them to boot, but the kernel and drivers will still need to be updated to allow the new hardware features to be used.
-
-## How to Automatically Install OSes
-
-### Auto-Installing one OS
-
-Even if you are using your Pi without a display, you can still use PINN to easily install an OS of your choice. To set up PINN to install a specific OS automatically and silently (i.e. without requiring any user input), follow these steps:
-
-1. Copy the OS folder for the OS you want to install into the `/os` dir (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 entry for the flavour that you want to install.
-3. Edit the `recovery.cmdline` file in the root PINN directory and append `silentinstall` to the arguments list.
-
-When you now boot your Pi using an SD card containing the modified version of PINN that you just created, it will automatically install the OS you chose and boot into it after the installation has finished.
-NOTE: `Silentinstall` only works if there are no OSes installed already to prevent accidental OS deletion.
-
-From v2.8.5 onwards, the network is always enabled, even when `silentinstall` is specified. So it may be necessary to temporarily disable any network sources whilst the `silentinstall` option is being used to prevent remote OSes from being listed, which would cause `silentinstall` to fail. YMMV.
-
-### Auto-Installing several Named OSes
-
-The `select=` option can be used to provide a comma separated list of one or more OS names that should be selected automatically. Ensure the whole argument to Select is enclosed in quotation marks.
-Normally, any installed OS is automatically checked, but this will not happen if the `select=` option is present. To restore this behaviour with the `select=` option, add `allinstalled` as a special flag.
-
-e.g. `select="Raspbian,LibreELEC_Rpi2,allinstalled"
-Will install the Raspbian and LibreELEC OSes, plus any OSes that are already installed.
-
-If a particular OS you want to install is on a particular source, you can force PINN to wait until that source has been listed by adding additional flags:
-`waitsd` will wait for all OSes on the SD card to be listed.
-`waitusb` will wait for all OSes on a USB drive to be listed.
-`waitnetwork` will wait for all OSes on remote OSes to be listed.
-`waitall` is a shorthand way of including all OSes and is equivalent to `waitsd,waitusb,waitnetwork`
-
-PINN only carries out the OS selection once all sources are present. So if you wait for a source that is not present, PINN may wait indefinitely until it appears.
-This is modified in v2.8.5.1 to try and avoid indefinite waits. However, adding a `networktimeout=0` option will wait indefinitely for the network to be present before silently installing.
-
-The `select=` option only determines which OSes are selected in the recovery menu at startup; it will not do anything with the listed OSes by itself.
-By adding the `silentinstall` option as well, then all selected OSes will be silently installed without user intervention. However, `silentinstall` only works
-if there are no OSes installed already to prevent accidental OS deletion.
-It is also used with the `silentreinstallnewer` option, but this has fewer safeguards. Please read the warnings below.
-
-Unlike using `silentinstall` on its own to install a single local OS, when using it with the `select=` option, PINN must read in all installation sources,
-so the recovery menu MUST be entered for this to occur. You can do this by using one of the many trigger options at startup, e.g. pressing the shift-key.
-For remote operation, consider using the `forcetrigger` option, maybe in combination with `remotetimeout` if necessary.
-
-### Auto-Installing OSes based on their source
-
-If you want to select all OSes present on the SD card, USB stick, or on a remote repository, then the following flags can be used for the `select=` option respectively:
-`allsd`, `allusb` or `allnetwork`. Each option also implies the corresponding `waitsd`, `waitusb` or `waitnetwork`.
-
-Note that when OSes exist on multiple sources, PINN selects the most recent one (or the local one if they are equal).
-So, for example, if 'allnetwork' is specified and you expect a remote Raspbian OS to be installed, it will not be if a more recent version exists locally, because the remote OS will be overridden by the newer local version. If you want a particular source of an OS to be installed, it may be necessary to hide the other sources using disableusbimages, disablesdimages, or disabling the remote repositories respectively.
-
-The `select=` option will not install the listed OSes by itself, but by adding the `silentinstall` option as well, then all selected OSes will be silently installed without user intervention. However, `silentinstall` only works if there are no OSes installed already to prevent accidental OS deletion.
-
-## Installer Slideshow
-
-An installer slideshow guides you through your first steps with each OS while it installs.
-
-
-
-### Auto-Reinstalling OSes
-
-The `silentreinstallnewer` option is added by particular request for a specific purpose, so be sure you understand how it works before using, otherwise you are at risk of
-losing your data.
-
-It is used in conjunction with the `select=` option to automatically reinstall any installed OS selected by that option if a newer version is found to exist
-on any installation source that is newer than the currently installed version. THERE ARE NO OTHER CHECKS except the name of the OS and its release date, so this option may
-unexpectedly wipe out any existing OS and restore it to a factory default state if you make a mistake - YOU HAVE BEEN WARNED!
-For this reason, it may be beneficial to install a Data Partition on your installation drive, on which all user data is stored, rather than storing it on the OS partition.
-In this way, the user data can be preserved when the OS is re-installed.
-
-It is advisable to only use named OSes in the `select=` option. Using any of the general options like `allinstalled` & `allnetwork` etc. May result in unexpected consequences!
-Likewise, you may wish to restrict your installation sources to a single location with judicious use of the `disableusbimages`, `disablesdimages` and the network source options
-to avoid a newer OS being installed from an unintended source.
-
-## Installation Progress
-
-During the installation of the operating systems, PINN will write the percentage completed to a text file called `/tmp/progress`. The format of this file is an integer (0-100) followed by a space, a '%' symbol, and a line feed. It is only updated when the progress changes by at least 1%. Sometimes PINN will not know the maximum size; in this case, it shows the amount data written in MBs.
-This feature mimics the progress dialog on the display and is useful in headless setups to monitor the progress of the installation.
-
-## Background shell script
-
-To make use of the installation progress feature, a background shell script can be used. If a `/background.sh` script exists, it will be executed in the background whilst PINN runs. This can be used to read the `/tmp/progress` file and display the progress on the serial port, a GPIO-based display, etc. amongst other things.
-
-## Initialisation shell script
-
-If a script called /pinn_init.sh exists in PINN's recovery partition, it will be executed before PINN is started.
-This script will be mounted as /tmp/media/pinn_init.sh and must complete before PINN starts.
-It can be useful to initialise third party display drivers before the main PINN splash screen is shown.
-
----
-
-# Booting an OS with PINN
-
-There are several ways of controlling the boot process and determining which OS gets booted.
-
-When PINN is booted, it displays a splash screen which provides enough time for the user to interrupt the boot process and go to the PINN recovery mode. The user may press the shift key, touch the logo on the touchscreen, press the left mouse button, or any recognised TV remote button when using the CEC interface to interrupt the boot process.
-
-The recovery mode will also be entered if no OSes have been installed, the `forcetrigger` is used or the GPIO trigger is used. Otherwise PINN will continue to boot one of the installed OSes
-
-## Booting a single OS
-
-If only one OS is installed, the boot selector will not be displayed and the OS will boot automatically.
-
-## OS Boot Selector
-
-After multiple OSes have been installed, a boot selection dialog is presented to list all the installed OSes for the user to choose one to boot. PINN will remember this OS choice and boot this OS by default each time unless a different option is selected within a timeout of 10 seconds. It is possible to change this menu timeout by adding `bootmenutimeout=X` in the `recovery.cmdline` file, where `X` is the desired timeout in seconds.
-
-A Boot button has been added for easier selection with limited CEC TV remotes, mice or touchscreens.
-Also a Cancel button (Shortcut=Esc) is provided to boot back into PINN again.
-
-
-
-## Sticky Default OS
-
-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. 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.
-
-## OS Boot selection order
-
-The order of the OSes presented on the boot selection dialog is dependent on their physical position on the drive, essentially the order they were installed. Using the up and down buttons, any selected OS can be moved up or down in this list, and hence the order can be changed to suit your needs.
-
-### Reboot shell script
-
-Just before PINN boots into the selected OS, it will execute
-`/before-reboot.sh` if it exists. A typical example for this script is to turn off the backlight of the Raspberry Pi 7" touch screen display. Be aware that any such script here must execute and finish before PINN will continue to boot the selected OS.
-
-
-## How to bypass PINN and boot directly into a fixed partition
-
-PINN provides many administration functions to assist you in installing, maintaining and booting multiple OSes. But to do this, it does slow the boot process down a little to allow time for the user to interact with the boot process. But even if you have installed multiple OSes, there may be times when you would like the Pi to always boot into one specific OS as quickly as possible and hide PINN completely.
-
-After you have installed your chosen OSes, add the following file to the root directory of PINN to force a specific OS to be booted each time.
-
-1. Add a text file named `autoboot.txt` to the root directory of PINN.
-2. Add `boot_partition=` to the file and save it to disk.
-
-The is the partition number of the boot partition of the OS you want to boot at each power on. The partition number can be found by running `sudo fdisk -l`. The partition will be one of the FAT32 partitions e.g. `/dev/mmcblk0p6` would be partition 6. It can also be found by looking at the installed_os.json file on the settings partition (partition 5) of the device that PINN is installed on. This will also prevent the splashscreen from being displayed at boot.
-
-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
-
-## Online Help via Web Browser
-
-The built-in Arora web browser allows you to easily get help via the Raspberry Pi Forums (network connection required).
-
-
-
-## Info on OS
-
-The Info button will take you to the web page specific to the currently highlighted OS in the selection list (network connection required).
-
-
-
-## Clear
-
-The clear button will de-select any selected OSes either in the available or isntalled lists. On startup, PINN will auto-select any installed OSes, but this may be overridden
-by the select option. In any case, this button provides a quick way of de-selecting all OSes in case you want to start afresh, without having to track them all down in the
-various tabs and windows.
-
-## Exit
-
-The Exit button (Esc) will exit recovery mode and go to the boot selection dialog, or directly boot the OS if only one is installed. The Exit button is ony enabled if bootable OSes have been installed. If only data partitions or ProjectSpaces have been installed, for example, then it will be greyed out.
-
----
-
-# Archival Menu
-
-
-
-## Download
-
-As documented earlier, PINN can install an OS from a local USB disk instead of directly from the internet for use when no internet is available, or to avoid repetitive slow or costly downloads. But to do this, the OS and is accompanying meta-files must be downloaded from the internet to the USB drive. PINN's `download` feature allows this task to be done easily. It will only download OSes that are sourced from the network - selected OSes on a USB stick, for example, will be ignored.
-
-You will be asked if you want to resume partial downloads. Only select this option if a previous download failed and you wnat to continue downloading the same file rather than starting again. Selecting Yes when no partial downloads are available could end up extending an existing file with a newer file, causing a problem.
-
-
-
-1. Format a USB drive as FAT32,ext4 or NTFS and create an `/os` folder on it.
-2. Insert the USB drive into the Pi.
-3. On the Archival Menu, select the USB drive in the status window.
-4. Select the list of OSes you want to download
-5. Select the Download button and wait for the OSes to download.
-6. Prior to v3.0.1, PINN will need rebooting to recognise and add these new OSes, but this is no longer necessary.
-
-The download icon is only available when the download size of all files are known. If the download icon is greyed out, and the toolbar indicates that that there are still more files to check, please wait until all files are checked.
-
-The download function will also download OS flavours and their customisation files from a remote repository. When downloading flavours, it is only necessary to download 1 of the flavours and all associated flavours will be downloaded. (OSes that have flavours should include all their additional flavour customisations in a single flavours.tar.xz file to allow for their download).
-
-After a file is downloaded it is checked against its signature checksum, if one is available. See [File Signatures and Checksums](#file-signatures-and-checksums)
-
-_Some OSes may require some terms and conditions to be accepted before the OS can be downloaded._
-
-## How to Clone an SD Card
-
-Raspbian has added an SD Card Copier tool called `piclone`, which is great. For anyone concerned about it cloning a live system,
-it has now been ported into PINN so that it can clone the SD card offline, whilst the OS is not running.
-
-
-
-1. On the PINN screen, select the new `Archival` toolbar by pressing the `More` button.
-2. Insert a second SD card into the Pi using a USB card reader.
-3. Select the Clone SD card button.
-4. Select your internal SD card as the source (/dev/mmcblk0) and the SD card in the USB reader as the destination (usually `/dev/sda`).
-5. Select OK to clone your SD card.
-
-All partitions will be copied onto the second card whilst the last partition will be sized to fit the remainder of the SD card.
-In this way, your existing data can be migrated to a smaller or larger SD card.
-
-_Note1: that if you have installed multiple OSes using PINN, only the last partition of the last OS on the SD card will be resized._
-_Note2: The clone function can also be used to copy any USB drive to any other USB drive - it doesn't have to incldue the SD card at all._
-
-## Set Time
-
-The Raspberry Pi has no real time clock, but it needs to know the correct time for https transfers and to timestamp any backups.
-The Pi's clock can be set automatically once it is connected to the internet, but this function can be used to set the clock manually if no internet connection is available.
-If a backup is attempted with no internet connection, this function will be called first to ensure the current time is set.
-
-
----
-
-# Maintenance Menu
-
-
-
-The maintenance toolbar contains commands to execute on installed OSes only, so the main window will only show a list of those OSes that are installed.
-
-The first entry is a dummy fixed entry called `PINN` which represents the PINN recovery partition. This enables the same toolbar commands to be carried out on the PINN recovery partition, such as doing a file system check or editing recovery.cmdline or config.txt files. Of course, changing the password will have no effect.
-
-## Easy Config File Editor
-
-The built-in config file editor allows you to edit the config file of the OS that is currently highlighted in the OS list. This allows you to easily add license keys to different OS installs through the same interface.
-
-When the PINN entry is selected, it allows you to edit the recovery.cmdline instead of the cmdline.txt file. A button called "Edit Options" will also appear which can launch a dialog box with all the possible options laid out amongst 4 tabs. This means you no longer need to remember all the option names as check and edit boxes are used instead.
-
-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.
-
-
-
-## How to Recover from a lost password
-
-If you have changed your login password for an OS and forget what it is, PINN will allow you to reset it back to its default or set it to a new value.
-
-
-
-1. On the PINN screen, select the new `Maintenance toolbar` by pressing the `More` menu.
-2. highlight the installed OS that you want to reset the password in.
-3. Selecting the Password button will display a dialog box to enter the new password details.
-4. Enter the username you want to change the password of.
-5. Enter the new password (twice). Both copies must match. The second will be displayed red if it is different.
-6. The password strength meter is a useful indication of how good a password you have created.
-7. The `Use Default` button will enter the default username and password for the selected OS.
-8. Tick the `show password` box to display the passwords on the screen.
-
-## Backup
-
-The backup function allows an installed OS to be backed up to a USB drive. The USB drive must first be formatted as FAT32, ext4 or ntfs and have a /os folder on it to store the backups in, otherwise it will not be recognised.
-
-Select all OSes to backup and then click the backup button. After a confirmation dialog, OSes that are not suitable for backing up will be indicated in a dialog box and deselected. These currently include Risc OS, XBian and Win10 IoT. Some other OSes have required modified setup scripts in order to restore them properly after backing up. If you are trying to backup an OS that was installed prior to this modification, PINN will try to install these modified files from an installable source. So to backup such an OS it may be necessary to connect the RPi to the internet or plug in a USB stick with the OS installation files on it.
-
-When an OS is backed up, it is given a name that includes the current time as a suffix in the format #YYYYMMDD-HHMMSS so that backups can be readily identified. If the RPi does not know the current time because it is not connected to the internet, you will be prompted to enter the current time. PINN gives you the opportunity to change this suffix and alter the OS description in the next dialog.
-
-This Backup feature is also useful to create Custom OS versions that can be installed by PINN or NOOBS onto other systems.
-
-OSes are backed up in NOOBS/PINN format as .tar.gz files. These do not compress as well as .tar.xz files, but require less memory and can be created faster on the RPi.
-Nevertheless, compressing tar files is still a processor intensive task, so backing up an OS will take a lot longer than installing an OS, especially on some of the less powerful RPis.
-Due to the compression, it is not known precisely how much disk space is required to store the backup, so PINN makes a conservative guess of 33% of the original size. It may require more or less than this amount, but if less disk space is available, a warning message is displayed, but the backup may continue if you wish. If there is insufficient disk space to complete the backup, this should be indicated. (You can also check the log in /tmp/debug for any errors.)
-
-**Backups should be thoroughly tested that they are valid and restorable before relying upon them. This is a new PINN feature and every effort has been made to ensure it works as expected, but the author accepts no liability or responsibility for loss of data.**
-
-After backing up an OS prior to v3.0.1, it may not show up in the list of installable OSes until PINN is rebooted, but now it will appear immediately in a separate "Backups" tab with all the other backup versions.
-
-When an OS is backed up, an sha512sum signature checksum is calculated for each tarball which will be used to verify its correctness when next installed. See [File Signatures and Checksums](#file-signatures-and-checksums)
-
-
-## Restoring Backups
-
-There is no specific "Restore" button to restore a Backed up OS. As the backup is aready in NOOBS format, the backed up OS can be installed as any other OS to a fresh (PINN format) SD Card or USB drive, or they can be used to replace an existing OS or ProjectSpace (if it is in a compatible partition layout).
-
-When a backed up OS is restored, PINN will fix up partition references by running the partitions_setup.sh script. However, certain tasks in that script that are only needed on an initial install will be skipped, as it is assumed they were already done and are not needed on restoration. This also includes the copying of ssh and wpa_supplicant.conf files from the PINN partition. Flavour customisation scripts are also not executed.
-
-Backed up OSes may be installed by NOOBS, but some OSes may not restore properly due to the need for modified setup scripts (see above) that NOOBS is not aware of.
-
-## How to Fix an OS
-
-If your installed OS will not boot, the Fix option in the maintenance menu may help. It provides a list of operations that you may perform to fix the OS. Check all operations that you want to be performed on your selected OSes.
-
-
-
-### File System Check
-
-Most RPi OSes typically delay writing any data back to SD or USB drives for performance reasons. Normally, this does not cause a problem provided the Pi is shutdown properly before removing the power, but this is not always possible. You may experience a power loss, or a program crash where pulling the power is your only recourse to recovering control. In these circumstances there is a risk that the SD card or USB drive may become corrupted if some data failed to get written to the drive before the power was lost.
-
-To recover from a corrupted drive, PINN includes a file system check option which will perform an `fsck -y` command on all partitions of the selected installed OSes. The output of the `fsck` command will be shown in a dialog box that can be scrolled to check the result. If it shows that recovery was unsuccessful, you may need to use more advanced disk recovery tools to fix the problem. Since this check option will work on multiple OSes, it is necessary to select the checkbox of each OS you want checked, otherwise no OSes will be checked. If you are paranoid, you may want to make a backup of any affected partitions before trying this fsck option.
-
-
-
-### Re-run partition_setup.sh
-
-Installed OSes may be upgraded using their standard upgrade procedure (e.g. sudo update;sudo upgrade etc.). However, some OS upgrade procedures may not be aware that they are running in a multi-boot environment and may break the changes PINN made to allow them to work. In this situation, re-running the OSes partition_setup.sh script should fix-up these changes to allow the OS to boot properly. From v3.0, PINN will now skip initial installation tasks in this script and it is restricted to fixing up partition references.
-
-## Reinstall Individual OSes
-
-The `install` function will install one or more OSes to your drive, allowing a multi-boot configuration. However, all selected OSes must be installed at the same time as it will repartition and format the drive prior to installing the OSes, thus wiping out any previous installations.
-
-The `Reinstall` option gets around this by allowing individual installed OSes to be over-written with the latest version of the corresponding OS, leaving all other OSes intact. As it does not repartition the drive, the new OS must fit within the same partition sizes as the OS occupied the last time it was installed.
-
-PINN itself is included in the list of installed OSes. If it is the ONLY OS to be selected, reinstalling it will perform a manual self-update check which is useful in the case where the `no_update` cmdline option has been used.
-
-## Replace Individual OSes
-
-The `replace` function will allow the replacement of an installed OS with another different OS, provided the number of partitions in the two OSes is the same and the new OS will fit within the existing partition sizes. So it will work with most OSes, but not for those that use a non-standard partition layout. Windows IoT and RiscOS are specifically excluded and it is unlikely many Android versions witll work, but your mileage may vary. Any other installed OSes will remain unaltered.
-
-This is particularly useful with the [Project Spaces](#project-spaces) feature, which will allow OS space to be reserved for installing an OS at a later date.
-
-To replace one or more OSes, first select the new OSes you want to install on the `Main Menu`. Then move to the `Maintenance Menu` and select the OSes (or project Spaces) that you want to be replaced and click the `Replace` button. A dialog box will pop up lsiting all the OSes to be replaced. Alongside each one is a drop down box, where you can select which new OS shall replace each installed OS. The Click OK to replace the old OSes with the new OSes.
-
-
-
-
-## Alias
-
-The `alias` function will allow an installed OS to be given an alias name, which can be used to rename an OS.
-When selected, a dialog box will open where the alias can be edited. The description of the OS can also be edited here.
-This can be useful to distinguish multiple copies of the same OS that have been installed using ProjectSpaces.
-
----
-
-# Advanced Usage
-
-## 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 PINN:
-- 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 PINN from http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip.
-2. Extract the PINN-lite 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:
- * "name" - replace the name of the base OS with the name of your custom OS version
- * "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:
- * "partition_size_nominal" - replace the numerical value with the size of the paritions in your custom OS version
- * "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 PINN - 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`.
- * To create the root tarball, you will need to run: `sudo bsdtar --numeric-owner --format gnutar --one-file-system -cpf \_root.tar .` from within the root filesystem of your custom OS version. You should then compress the resulting tarball with `xz -9 -e \_root.tar`.
- * To create the boot tarball, you will need to run `sudo bsdtar --numeric-owner --format gnutar -cpvf \_boot.tar .` from the boot partition of your custom OS version. You should then compress the resulting tarball with `xz -9 -e \_boot.tar`.
-
-_More detailed instructions are available in the Wiki at https://github.com/procount/pinn/wiki/How-to-Create-a-Multi-Boot-SD-card-out-of-2-existing-OSes-using-PINN_
-
-Also note that if your custom OS is already on a PINN formatted SD card but you've made some changes that for example you want to install as a custom OS to other cards, then simply backing up the OS will create a custom OS version.
-
-## How to customise an OS install (noobsconfig)
-
-PINN can be used as a recovery program, so if your OS gets corrupted, messed up, or otherwise goes wrong, you can reinstall a clean version of the OS and start again. On the other hand, starting again from scratch can be painful, especially if you can't remember how you set up your perfect OS environment.
-
-Creating a custom OS version (see above) for your preferred setup is one option, but it can look daunting to do, and would need to be repeated if you want to update it to include the latest build of the OS.
-
-[Noobsconfig](http://github.com/procount/noobsconfig) is an alternative option that creates a customised OS by installing a standard OS, but then copies your own files over the top to add your own customisations according to your selected "flavour". These additional files are specified in a simple text file that controls their installation. For example, these can be simple configuration files, workshop exercises, tutorials, or Wi-Fi setup files. Alternatively, they could be scripts that are configured to run on first boot to further configure your OS by automatically installing your favourite packages.
-
-By keeping the customisations separate from the OS distro means:
-
-1. A custom installation can be created out of a standard OS installation plus some additional files, without having to create a full customised OS.
-2. The same customisations can be applied to a newer version of the standard OS installation without having to rebuild a custom OS installation.
-3. By using simple configuration files, it is easy to add files to configure your OS.
-4. Different customisation "flavours" of an OS can be created as a master installation card, and the required ones can be selected and installed as required. This can save a lot of SD card space compared to storing a different full customised OS for each flavour.
-
-PINN now includes direct support for `noobsconfig`, so it is no longer necessary to add the `noobsconfig` files to your PINN installation. Just add your configuration and customisations files and install your "flavoured" OS. Please see (https://github.com/procount/noobsconfig) for full documentation on how to use this feature.
-
-The `configpath` command line option will cause PINN to search for the customised files in another location (folder or URL) rather than the same location as the os_info.json file for the OS, but this will affect ALL OSes.
-
-The [PiKitchen](http://www.pihardware.com/guides/pi-kitchen) is an example of how comprehensive these configurations can be if you want them to be.
-
-## How to auto-switch HDMI/DSI screen configurations
-
-If an HDMI and a DSI screen (such as the Raspberry Pi Touch Screen) are both connected to the Raspberry Pi, the selection of which screen is to be used as the default needs to be selected in the `config.txt` file, which means constantly having to change `config.txt` to match whichever screen is required. This is because the DSI screen can only be selected at boot time, although without *any* configuration, the GPU will select the DSI screen in preference to the HDMI. PINN provides some limited ability to reverse this priority.
-
-This use case assumes that the DSI screen is always connected, and is normally used. But if an HDMI screen is connected, then the display will automatically switch to it.
-
-1. Create a `config.txt` file in the PINN root partition. Ensure it has the line `ignore_lcd=1` to disable the DSI screen and select the HDMI screen.
-2. Edit `recovery.cmdline` and add the `dsi` keyword.
-3. In the boot partition of any installed OS, create a `config.dsi` file to configure the DSI screen, and a `config.hdmi` file to configure the hdmi screen. (This can mostly be setup using a custom flavour with the `noobsconfig` feature so it can be installed automatically.)
-
-When PINN boots, the HDMI screen will be selected, so to use any PINN feature, an HDMI screen **must** be connected.
-
-PINN will automatically boot the last selected OS after it times out. If a HDMI screen is attached, PINN will copy the `config.hdmi` file to `config.txt` on the selected OS and reboot into it.
-
-If an HDMI screen was not detected, PINN will copy the `config.dsi` file to config.txt on the selected OS and reboot into it.
-
-When using this technique, do not make any modifications to config.txt directly otherwise they will be overwritten by PINN on next boot. Instead, modify the appropriate config.dsi or config.hdmi file.
-
-### Automatic Screen Detection
-
-From v3.1 PINN includes automatic screen detection amongst HDMI, DSI and Pimoroni Hyperpixel screens. To enable this feature, download screenswitch.zip and unzip to the PINN recovery partition. This includes some config.txt files for the various screens and a pinn_init.sh script to detect and switch the screen configuration. The idea is that no matter which of these screens is fitted, PINN will always be able to make its display visible.
-
-In the case where mutiple screens are attached at the same time, enter your preferred screen on the first line of `screenpref` as hdmi, dsi, hyp3 or hyp4 and PINN will attempt to select this one.
-
-When PINN detects a different screen is fitted, it will reconfigure itself and reboot to make this take effect, so it takes slightly longer to boot in this instance.
-
-Whilst the Hyperpixel screens and the HDMI monitor can nearly always be detected, the RPF DSI Touchscreen is sometimes not detectable, or hidden, depending on the current configuration. In this case it may be necessary to remove some displays and/or switch to HDMI mode in order to detect the DSI touchscreen and then switch to it.
-
-Whilst using this screen detection technqiue, do not edit config.txt, but rather change the config file for the appropriate display. Also do not change the first line of each config file as this is used by the script to detect the current configuration.
-
----
-
-# Troubleshooting
-
-## What to do if your SHIFT keypress isn't detected
-
-Try pressing shift only when the grey splash screen is displayed, rather than holding it from boot up.
-
-## 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 PINN directory.
-2. Reboot.
-
-Note that with this option enabled, the Recovery Mode will be displayed every time you boot from your PINN 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 PINN 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 PINN directory.
-2. Reboot.
-
-## How to enable using the GPIO to trigger entering Recovery Mode
-
-To force Recovery Mode to be entered on boot and to show the PINN 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 PINN interface to be displayed on boot:
-
-1. Append `gpiotriggerenable` to the argument list in the `recovery.cmdline` file which is found in the root PINN 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 boot into "Safe Mode"
-
-To boot into a basic busybox shell rather than launching the PINN GUI, you can *either*:
-
-1. Append `rescueshell` to the argument list in the `recovery.cmdline` file which is found in the root PINN directory. Exiting from this shell will now enter the PINN recovery program.
-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 PINN directory).
-
-## Debug Information
-
-PINN produces a debug log which can be helpful if something goes wrong. Please see the [troubleshooting guide](https://github.com/procount/pinn/wiki/Troubleshooting) in the wiki on how to access this and waht to do if you suspect a bug.
-
----
-
-# FAQ
-
-Q1. After using the Wipe Disk command, PINN will halt "Waiting for the settings partition" on next boot.
-
-A1. Sometimes the repartitioning will not satisfy all constraints and fails. In this case, add `runinstaller` to recovery.cmdline and reboot. This will cause PINN to repartition the card again for use by PINN.
-
----
-
-# How to Rebuild PINN
-
-Note that this will require a minimum of 6 GB free disk space.
-
-## Get Build Dependencies
-
-On Ubuntu:
-
-`sudo apt-get install build-essential rsync texinfo libncurses-dev whois unzip bc qt4-linguist-tools`
-
-Also needed is bsdtar v3.3.1 which can be built as follows:
-```
-wget https://www.libarchive.org/downloads/libarchive-3.3.1.tar.gz
-tar xzf libarchive-3.3.1.tar.gz
-cd libarchive-3.3.1
-./configure
-make
-make install
-
-if make install doesn't work (Raspbian), just copy bsdtar to /usr/bin.
-```
-
-## Run Build Script
-
-`./BUILDME.sh`
-
-Buildroot will then build the software and all dependencies, putting the result in the `output` directory.
-
-By default, buildroot 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 set up an SD card with a newly built version of PINN, 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 PINN (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 than when deployed on the Pi. You can
-raise the font sizes 2 points to compensate for this.
-
-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 built by buildroot:
-Type `cd buildroot ; make legal-info` to generate a list, which will be available under `output/legal-info`.
+
+# What is PINN (PINN Is Not NOOBS)?
+
+**An easy enhanced Operating System installer for the Raspberry Pi**
+
+The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip) can be downloaded from [sourceforge](http://www.sourceforge.net/projects/pinn).
+
+This README relates to v3.2.4a
+
+(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.)
+
+## Index
+
+* [Quick Start](#quick-start)
+* [PINN User Interface](#pinn-user-interface)
+* [PINN Configuration](#pinn-configuration)
+* [Installing OSes](#installing-oses)
+* [Booting an OS with PINN](#booting-an-os-with-pinn)
+* [Other Features](#other-features)
+* [Archival Menu](#archival-menu)
+* [Maintenance Menu](#maintenance-menu)
+* [Advanced Usage](#advanced-usage)
+* [Troubleshooting](#troubleshooting)
+* [FAQ](#faq)
+* [How to Rebuild PINN](#how-to-rebuild-pinn)
+
+# Introduction
+
+## Features
+- A multi Operating System (OS) installer
+- An operating system selector
+- A boot manager
+- An OS maintenance utility:
+ - Backup and Restore OSes
+ - A recovery shell
+ - SD card clone utility
+ - Password restorer
+ - File System Checker
+
+
+
+*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 the installation sources.
+
+## Benefits
+
+PINN 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.
+
+Once PINN is installed on your SD card, the installation of other OSes and a lot of the maintenance of them can mostly be done on the RPi itself without having to remove the SD card.
+
+The list of OSes that can be installed by PINN is growing all the time, from general purpose Linux distros, through educational versions, media centres to retro gaming solutions. It is the ideal environment to experiment and try out new OSes.
+
+PINN occupies just over 60MB of your precious SD card space, leaving the majority of the card available for your OSes.
+
+### General Operation
+
+On first boot, PINN 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 locally available OSes (i.e. those contained in the `/os` directory on disk or an attached USB memory stick) and those available from a remote repository (network connection required).
+
+Only the latest version of each OS will ever be displayed. So, you can be sure that you have installed the most up-to-date release of your selected OS.
+
+On any subsequent boot, you can press the SHIFT key to enter the PINN interface and easily reinstall your choice of OSes. It is also possible to press the Left mouse button, press any key on a CEC enabled TV remote, or touch the Raspberry logo on the touchscreen to enter the PINN interface.
+
+If no input is provided, PINN will proceed to the boot selection dialog. If only one OS installed it will booted immediately, otherwise a menu of installed OSes will be presented for one to be selected. If no choice is detected within a timeout period, the last booted OS, or a default OS will be chosen.
+
+It is also possible for PINN to be bypassed altogether and one of the OSes booted directly from startup. In this way it is not even noticeable that PINN is there, but it can be reinstated simply by deleting a single file on the PINN partition.
+
+## Requirements
+
+- A Raspberry Pi with power supply (works with all models)
+- A blank micro SD card (or SD card for an earlier Model 1 RPi). 8GB is the minimum recommended size. 16GB or larger is preferred, especially if you want to install locally from the SD card.
+- (optional) A keyboard and mouse (unless you want to use it headlessly).
+- (recommended) A network connection (unless you want to install OSes from a local source, but you'll need to download them somehow first!).
+- (recommended) A USB uSD card reader is not required, but it is an essential bit of kit to allow a PC to format the uSD card, install PINN initially and general editing if something goes wrong.
+- Access to NOOBS formatted OS distributions (via Internet or local memory device).
+- [pinn-lite.zip](http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip).
+
+---
+# Quick Start
+
+The following Quick Start instructions detail the most common and quickest way to start using PINN. For more details on the other features that PINN provides, please continue reading the rest of this document.
+
+## 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.) **In some cases, the files may be extracted into a folder. If this is the case, please copy the files from inside the folder rather than copying the folder itself.**
+
+## Using Etcher
+
+An alternative to unzipping the pinn-lite.zip file to a FAT32 formatted drive is to use the popular Etcher program
+to burn an image directly to the SD card.
+
+The [pinn-lite.img.zip](http://sourceforge.net/projects/pinn/files/Etcher/pinn-lite.img.zip) image file you need to burn can be found on [sourceforge](http://www.sourceforge.net/projects/pinn) in the Etcher folder.
+
+## 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.
+
+## Self Update
+
+If PINN is connected to the Internet, it will check for the latest version available for download from the recovery main menu. If a newer version is available, a dialog box will pop up, showing the latest version number and the recent changes. You then have the option to cancel the update, download it, or ignore this version.
+
+If you cancel the update, the dialog box will keep popping up to remind you each time PINN starts.
+
+If you select "ignore", this version will be ignored and no dialogs will pop up again until another later version is released.
+
+If you choose to download this update, the zip file will be downloaded and will overwrite your current version of PINN. PINN will then reboot the RPi and restart PINN.
+
+It is possible to disable self-update checks by adding the `no_update` option to `recovery.cmdline`. In this case you will have to delete this option to enable self-updates again. Or you can manually check for updates at any time by choosing to `reinstall` the PINN item in the archival menu, but it must be the only item selected.
+
+You can force new updates to be automatically installed without user interaction by adding the `forceupdatepinn` to `recovery.cmdline`.
+
+---
+
+# PINN User Interface
+
+The PINN user interface is kept fairly simple, comprising a switchable toolbar of command buttons, a list of installable operating systems and a status window indicating the capacity of appropriate attached memory devices. At the bottom of the screen is a small display customisation dialog that permits changing the language and keyboard layout of the user interface. The model of RPi you are using is also displayed just above this,
+
+
+
+## Toolbars
+
+There are three toolbars:
+
+- **[Main Menu](#main-os-list-window)**
+ - **[Install](#installing-oses)**: Installs the selected OSes onto your SD card. Changing this selection erases all OSes that are currently installed.
+ - **[Wifi](#wireless-wifi-networks)**: configures the wifi.
+ - **[Help](#online-help-via-web-browser)**: [Networking Required] Opens a browser that displays the Raspberry Pi Help page (http://www.raspberrypi.org/help/), allowing people to quickly access help and troubleshooting information.
+ - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
+ - **[Clear](#clear)**: Clears all selected OSes from the available and installed OS lists.
+ - **[Exit](#exit)**: Quits PINN and reboots the Pi into the OS boot menu.
+- **[Archival](#archival-menu)**
+ - **[Download](#download)**: Downloads an OS for offline installation.
+ - **[Clone SD](#how-to-clone-an-sd-card)**: Clones the SD to another card.
+ - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
+ - **[Firmware](#pinns-firmware-upgradedowngrade)**: Upgrades or downgrades PINN's firmware for use on RPI3B+ or other models.
+ - **[Time](#set-time)**: Sets the current time.
+- **[Maintenance](#maintenance-menu)**
+ - **[Edit Config](#easy-config-file-editor)**: Opens a text editor, allowing the `cmdline` and `config` files for the selected installed OS to be edited.
+ - **[Password](#how-to-recover-from-a-lost-password)**: Allows the password of an OS to be restored or replaced.
+ - **[Backup](#backup)**: Backup Operating Systems.
+ - **[Fix](#how-to-fix-an-os)**: Performs repairs on file systems of the selected installed OSes.
+ - **[Reinstall](#reinstall-individual-oses)**: Allows individual installed OSes to be reinstalled back to their original installation without affecting any of the other installed OSes.
+ - **[Replace](#replace-individual-oses)**: Allows individual installed OSes to be replaced by other/different OSes without affecting any of the other installed OSes.
+ - **[Info](#info-on-os)**: [Networking Required] Opens a browser that displays the webpage for the selected OS.
+ - **[Alias](#alias)**: Renames an installed OS by assigning it an alias.
+
+The `more` button can be used to cycle through the 3 toolbars. (shortcuts = M)
+
+## Main OS List Window
+
+Beneath the toolbar is the main list of Operating Systems which displays the name and a short description of each OS. At the right hand side is an icon indicating the source where the latest version will be installed from (Internet, SD card or USB drive).
+
+OSes are grouped onto tabs which categorise the type of OS they are. This grouping includes the following categories: General, Media, Gaming, Education, Minimal & Utility. To avoid this grouping, specify **`no_group`** on recovery.cmdline and the OSes will all appear in one list.
+
+Each OS has a checkbox at the left hand side to select whether it will be installed or not. When PINN is booted with OSes already installed, these OSes will normally have their checkbox automatically ticked (but see the `select` option) and their background will also be light green in colour, along with the word **[installed]** next to their name. Note that installed OSes may be selected in multiple tabs.
+
+When the **Maintenance** toolbar is selected, this list will change to only show the list of OSes that are already installed, since the toolbar buttons are only relevent to installed OSes.
+
+## Status Window
+
+Below the main OS List Window is a status window indicating the capacity of appropriate attached memory devices.
+
+On the **Main Menu**, this status window will show the space on the SD card that is available to install OSes, along with the amount of required space for the selected OSes. If a USB drive is inserted, a drop down selection box will appear to change the install device from the SD card to the USB device. You will be prompted to format the USB drive if it is not already formatted in the correct way for a PINN installation. The model of RPi you are using is shown in the bottom right corner of this status window.
+
+On the **Archival** menu, this status window will change to show the amount of available and required space on the USB drive for downloading OSes to. Such a USB drive will only be selectable if it has an /os folder on its first partition to store OSes on.
+
+On the **Maintenance** menu, this status window will not appear.
+
+## Display Customisation
+
+In addition to the toolbars, the following functionality is provided:
+ - Language Selection : Allows you to select the language used for text display.
+ - Keyboard Layout Selection : Allows you to select the keyboard layout to be used.
+ - Display Mode Selection : By default, PINN 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 (1), HDMI safe mode (2), composite PAL mode (3), or composite NTSC mode (4), respectively.
+ - Background colour : To change the background colour for the screen and most windows, add `background=r,g,b` to recovery.cmdline, where 0,0,0 is black and 255,255,255 is white.
+ - style : The style of the windows display can be modified by adding `style=motif/windows/platinum` to recovery.cmdline
+ - Wallpaper : The background wallpaper of PINN can be changed by adding your own `wallpaper.jpg` or `wallpaper.png` file to PINN's recovery partition.
+ - wallpaper_resize : A custom wallpaper can be resized to fill the entire desktop by adding this option.
+
+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 PINN interface on your display device, you should be able to see the OS CLI/GUI when it boots too.
+
+## User Control
+
+### Mouse & Keyboard
+
+If you are using the RPi locally, the majority of the program can be used with a mouse alone, although a keyboard can make it easier. A keyboard is required to enter the wifi credentials if you want to connect to a network that way. However, the wifi can be preconfigured to avoid even this use.
+
+### CEC Control
+
+PINN can be controlled with a TV remote, if the HDMI TV has CEC support.
+The default CEC remote keys are mapped as follows:
+
+To simulate a mouse the following keys are used:
+- Cursor Up/Down/Left/Right - moves the mouse cursor in each direction
+- Select - mouse click
+
+For quicker selection, the following keys may be easier if supported by your model of TV:
+- Channel Up - previous list item
+- Channel Down - next list item
+- PLAY key - Enter Key
+- Exit Key - Escape
+- 9 key - Changes the toolbar
+- 1-8 keys - select the menu buttons numbered from left to right
+
+Any of the above remote keys can be used instead of the keyboard shift key on startup to access the main menu.
+
+There is no onscreen keyboard in PINN, so a local keyboard will be needed to enter wifi credentials, unless the wifi is preconfigured.
+
+**NOTE: CEC implementations vary between TV manufacturers. The above key mappings work on Samsung TVs supporting their Anynet+. Other TV brands may not work as well, but the mouse simulation is designed to work on most TVs.**
+
+It is possible to program your own set of key mappings for your particular remote.
+To do this you should create a `cec_keys.json` file.
+See the [cec_keys.md](cec_keys.md) document on how to do this.
+The default mappings are listed in the [wiki](https://github.com/procount/pinn/wiki/Default-CEC-Key-mappings-for-cec_keys.json).
+
+### How to use with the Raspberry Pi Touch Display
+
+If PINN 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 touchscreen on the Raspberry logo (or holding down the shift key) can activate PINN.
+- A tap on the touchscreen will simulate a mouse click.
+- A long press on the touchscreen will simulate a mouse double-click.
+
+There is no onscreen keyboard in PINN, so a local keyboard will be needed to enter wifi credentials, unless the wifi is preconfigured.
+
+### How to use with Gert's VGA666 DPI display screen
+
+The VGA666 adaptor connects to the GPIO pins and allows a VGA display to be attached to the RPi. The normal VGA666 installation instructions should be followed to allow it to work with PINN.
+
+Create a config.txt file with the following lines in it:
+```
+dtoverlay=VGA666
+enable_dpi_lcd=1
+display_default_lcd=1
+dpi_group= (e.g. dpi_group=1, or dpi_group=2)
+dpi_mode= (e.g. dpi_mode=28 - see tvservice for a list of possible modes)
+```
+In addition, the `recovery.cmdline` file should have `disablesafemode` added as a parameter. Without it, the VGA666 will force PINN into safe mode, due to its connections to the GPIO header.
+
+Remember to also enable the display in each OS that you want to use it with.
+
+### How to use with Pimoroni's Hyperpixel displays
+
+Support for Pimoroni's original Hyperpixel and the Hyperpixel4 displays has now been built into PINN in the form of new composite kernel drivers. These provide screen detection, LCD initialisation and touchscreen support for both screens.
+
+To enable support for these screens add the appropriate dtoverlay to your config.txt file. The supported parameters are provided below:
+
+Name: pimhyp3
+Info: Overlay for activation of Pimoroni Hyperpixel 3.5"
+Load: dtoverlay=pimhyp3,]
+Params: rotate or rotate_0 Default orientation (landscape)
+ rotate_1 Rotate 90 degrees CW (portrait)
+ rotate_2 Rotate 180 degrees (landscape)
+ rotate_3 Rotate 180 degrees (landscape)
+ checkonly Checks for presence of screen but does not load driver
+ poll Uses polling instead of interrupts for Touchscreen
+ refresh-rate= Sets the refresh rate for polling mode in ms.
+
+Name: pimhyp4
+Info: Overlay for activation of Pimoroni Hyperpixel 4"
+Load: dtoverlay=pimhyp4,]
+Params: rotate or rotate_0 Default orientation (portrait)
+ rotate_1 Rotate 90 degrees CW (landscape)
+ rotate_2 Rotate 180 degrees (portrait)
+ rotate_3 Rotate 270 degrees (landscap)
+ checkonly Checks for presence of screen but does not load driver
+
+To rotate the screens, add `display_lcd_rotate=0` to config.txt.
+Replace the `0` with 1,2 or 3 for the various rotations.
+To rotate the touchscreen add the appopriate dtparam to the overlay, e.g. `dtoverlay=pimhyp4:rotate_0`
+For some rotations, it may also be necessary to set the `framebuffer_width` and `framebuffer_height` parameters.
+
+Example config.txt files called config.hyp3 and config.hyp4 are included with example settings for each of the 4 rotations.
+
+Remember to also enable the display in each OS that you want to use it with.
+
+### How to use PINN Headlessly (VNC)
+
+It is possible to access PINN without a keyboard and mouse using VNC over a network.
+
+Append `vncinstall` to the argument list in the `recovery.cmdline` file which is found in the root PINN directory. Using `forcetrigger` in addition can be useful as it is not always easy to connect quickly enough to see the splash screen and hold the shift key remotely. This will force you to use VNC to continue the boot process into your installed OS on each boot, so it is best to remove `forcetrigger` once the required OS's have been installed. Alternatively you could use `gpiotriggerenable` (see later).
+
+To connect over VNC, you need to know the IP address of the Pi. If you are using DHCP, then you should see your router for a list of the devices connected to it and the IP addresses that have been assigned, or use an IP scanner like Fing to identify your device. If you have a monitor attached and are using `vncshare`, the IP address of the PI is shown in the window title bar for ease of connection. Connect to port 5900 of this IP address. Using tightvnc, you need to specify this as :5900 e.g. 192.168.1.0:5900.
+
+When VNC is selected, there will be no GUI present on any attached display, as all output is redirected over the VNC network connection. Alternatively, appending `vncshare` to the argument list instead of `vncinstall` will share the screen between the locally attached display and redirect it over the VNC network connection simultaneously.
+
+NOTE 1: These VNC options are meant to be used on a local LAN only. If your Pi is open to the internet, **anyone** can gain access to PINN as there is no security.
+
+Note 2: The `remotetimeout` option is useful to gain remote access within a timeout period, yet, allowing the default boot operation to continue.
+
+### How to access the shell or SSH into PINN
+
+1. Once the PINN GUI is launched, the busybox shell can be accessed by pressing CTRL-ALT-F2. Use the Username of `root` and password of `raspberry`. Use CTL-ALT-F1 to get back to the GUI. This can be useful for editing recovery.cmdline locally or performing other maintenance tasks on your SD card.
+
+2. You can also SSH into the PINN basic busybox shell. To enable this feature, add `ssh` to the argument list in the `recovery.cmdline` file. SSH is also accessible from the rescueshell, but allow 5 seconds after boot to allow the network to establish. PINN SSH does not store any keys, so it takes a while to connect at first after each boot as it generates new keys for that session.
+
+The IP address of the PI is shown in the window title bar for ease of connection.
+
+Use the username of `root` and password `raspberry` to login to the shell via the console or SSH.
+
+NOTE: This SSH option is meant to be used on a local LAN only. If your Pi is open to the internet, **anyone** can gain access to PINN as the only security is a well-known username/password.
+
+### Shell editors
+
+Two editors are available in the recovery shell: vi and nano. Only the Tiny version of nano is included, so some features may not be present when compared to the version supplied with Raspbian.
+
+### How to change display output modes
+
+By default, PINN 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 (1), HDMI safe mode (2), composite PAL mode (3), or composite NTSC mode (4), respectively.
+
+If you don't have a keyboard, you can still change the display mode used by PINN through editing the `recovery.cmdline` file in the root PINN directory prior to first boot and appending the following argument:
+- `display=` (e.g. `display=1` or `display=3`)
+
+---
+
+# PINN Configuration
+
+## Network Connection
+
+To get the best out of PINN it is important that it has access to the internet in order to keep itself updated and ensure it has access to the latest version of each OS. Connecting to a switch or router with an ethernet cable is the easiest way to get it online. Wifi support is enabled for all built-in wifi chips and many popular wifi dongles, but it requires a little more setup to connect to the correct wifi network.
+
+PINN will also work in offline mode to install OSes from a USB memory device, or even from the SD card itself. This is useful at locations where network access is not assured, for example at Raspberry Jams or schools, but the OS installation files still need to be downloaded from the internet at some point and kept up to date.
+
+### Wired Networks
+
+If a wired ethernet cable is plugged into the Pi before PINN starts, PINN will connect to your DHCP enabled router. This is the easiest way to access the Internet as it requires no configuration. PINN will connect to a remote download repository and present a list of available operating systems that are available for installation.
+
+### Wireless Wifi Networks
+
+If you have the official [Rapberry Pi USB wifi Dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/), or are using the Raspberry Pi 3 Model B/B+ or Pi0W with built-in Wi-Fi, the Wi-Fi icon on the PINN toolbar will be available. Click on this to select your Wi-Fi SSID network and enter the Wi-Fi password. If the password is correct, you will soon be connected to the Internet and PINN will present a list of downloadable operating systems for you to install.
+
+
+
+PINN will remember your wifi network connections, so it is only necessary to enter them once. Some operating systems, like Raspbian, will copy these wifi connections when they install, so they will also be able to use them as soon as they are booted.
+
+### Preconfiguring a WiFi network
+
+If you already know your WiFi details, you can preconfigure PINN to use them straight away. Put a copy of your `wpa_supplicant.conf` file on the PINN root partition and PINN will read it and store it in its settings for all future uses. The file will be renamed to `wpa_supplicant.conf.bak` to prevent it from overwriting any subsequent changes you make to the Wi-Fi networks using the GUI. This file will also be passed on to some OSes when they install.
+
+If you need to have more control over your network connection, like setting a static IP address, it is also possible to drop a new copy of the dhcpcd.conf file onto the PINN root partition and PINN will read it and store it in its settings for all future uses. The file will be renamed to `dhcpcd.conf.bak` after being copied.
+
+### Network Drivers
+
+From v1.9.4, the following network drivers have been added to support a wider range of Wi-Fi and network adapters:
+* zd1211rw
+* rtl8192cu - fixed in v1.9.5
+* rt2500usb
+* rt73usb
+* rt2800usb
+* mt7601u
+* rtl8150
+* r8152
+* asix
+* ax88179_178a
+* dm9601
+* smsc95xx
+
+from v2.0
+* rtl8188eu - for hubpiwi and others
+from v2.1
+* IoTpHAT
+from 2.4.5f
+* rtl8812
+
+NOTE: Realtek wifi drivers (rtl8188eu, rtl8812au, rtl8192cu) are not present in v2.5.1.
+
+### Enabling SSH for Raspbian
+
+In recent Raspbian releases, SSH has been disabled by default for security reasons. To override this and enable SSH from first boot, it is necessary to create a file called `ssh` or `ssh.txt` in the Raspbian boot partition. If PINN detects such a file in the PINN recovery partition, it will copy it across to the Raspbian boot partition whenever it is installed, enabling SSH to be enabled immediately, which is very useful especially for headless installs.
+
+NOTE: this file does not enable SSH access to PINN. To enable that the 'ssh' keyword must be added to `recovery.cmdline`.
+
+### How to change the default Language, Keyboard layout, Display mode, or Boot Partition etc.
+
+Edit the `recovery.cmdline` file in the root PINN 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.
+
+## Cmdline Options
+
+The following is a complete list of all the PINN options that can be added to the `recovery.cmdline` file on the PINN recovery partition to affect its operation:
+
+- **runinstaller**: This option is present when PINN is first installed to cause it to reformat the SD card. Once reformatted, PINN will delete this option. Manually adding it back in will cause PINN to reformat the SD card on next boot, losing any and all installed OSes, so be careful!
+
+- **reserve=(+)NNN**: This option will reserve a set amount of space for PINN's partition (typically /dev/mmcblk0p1) when the `runinstaller` option first formats the SD card. This space may be useful for adding OS install files later, or for using the first partition as a transfer area for data between the RPi and a Windows PC that can only read the SD card's first partition. NNN specifies the total size of this partition in MB. The default value is around 64MB. If the size is prefixed with a '+' sign, the value indicates an amount of disk space to be reserved [i]in addition[/i] to the size of PINN's files. So, `reserve=200` will make P1 200MB in size and `reserve=+200` will make it about 263MB in size.
+
+- **no_update**: Prevents PINN from performing a self-update check on boot up. Use the `reinstall` option to manually check for updates on PINN.
+
+- **forceupdatepinn** - Forces a PINN self update if one exists, without user interaction.
+
+- **nofirmware**: Prevents PINN from upgrading the firmware of old OSes to be compatible with PINN.
+
+- **vncinstall**: Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
+
+- **vncshare**: Uses a VNC network connection to control PINN. However, unlike `vncinstall`, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
+
+- **ssh**: Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions.
+
+- **rescueshell**: This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal. Alternatively, inserting a physical jumper between pins 5 & 6 of GPIO header P1 will cause the rescueshell to be entered as well.
+
+- **lang=\**: Sets the language to be used by PINN
+
+- **keyboard=\**: Sets the keyboard code to be used by PINN
+
+- **display=\<1|2|3|4\>**: Sets one of 4 simple display modes
+
+- **partition=\**: Sets the default partition to be booted if no input is detected.
+
+- **forcetrigger**: Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
+
+- **gpiotriggerenable**: Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
+
+- **gpiochannel=\**: Allows a different GPIO pin to be specified to trigger the recovery menu.
+
+- **gpiochannelValue=\**: This specifies the value the GPIO shoudl be set to to trigger the recovery menu. The default is 0. Specify 1 to trigger when the GPIO pin goes high.
+
+- **keyboardtriggerdisable**: Prevents a `SHIFT` keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
+
+- **remotetimeout=\**: When used in conjunction with `forcetrigger` it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot. This permits normal default OS booting, yet also allows for a remote user to interrupt the startup process to change the OS to boot, or perform any remote maintenance. Any screen interaction over VNC will cancel the timeout. This additional timeout will lengthen the boot time into a default OS, so choose a value that is long enough to allow VNC access, yet short enough not to be annoying under normal circumstances.
+
+- **networktimeout=\**: PINN will wait for a default timeout of 8 seconds to detect whether a network is connected or not. (This is extended by an additional 4 seconds if wifi is configured). This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish. Setting a value of 0 will disable the "Please wait while PINN initialises" progress box and will wait indefinitely for the network before installing any required OSes.
+
+- **disablesafemode**: 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" by entering the rescueshell. To prevent this, you can append `disablesafemode` to the `recovery.cmdline` file.
+
+- **silentinstall**: Allows a single or multiple OSes to be installed automatically, useful during headless installs. See [How to Automatically Install OSes](#how-to-automatically-install-oses)
+
+- **select=\**: Auto-selects a number of OSes or OS sources to be installed. When used in conjunction with `silentinstall`, the OSes are automatically installed without any user intervention. See [How to Automatically Install OSes](#how-to-automatically-install-oses).
+In addition to specifying a list of OS names, some reserved words are also available to specify different sources of OSes instead, or to control when they are installed.
+ - `allinstalled` - Normally, all installed OSes are automatically selected, but they are not selected when the "select" option is present. Adding 'allinstalled' will ensure they are selected again.
+ - `allsd` - Selects all OSes where the most recent one is on the SD card
+ - `allusb` - Selects all OSes where the most recent one is on a local USB drive
+ - `allnetwork` - Selects all OSes where the most recent one is on remote repositories.
+ - `waitnetwork` - Waits for all OS lists to be downloaded from the internet before checking the list of OSes
+ - `waitusb` - Waits for all OSes on local USBs to be listed
+ - `waitsd` - Waits for all OSes on the SD card to be listed
+ - `waitall` - Waits for OSes from all sources to be listed
+
+- **silentreinstallnewer**: This is an advanced option and potentially _**Destructive to your data!**_. Do not use unless you are fully aware of its consequences. See [Auto-Reinstalling OSes](#auto-reinstalling-oses)
+
+- **alt_image_source=\**: Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
+
+- **repo_list=\**: Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet respositories.
+
+- **repo=\**: Similar to `alt_image_source` but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
+
+- **no_default_source**: Prevents the default RaspberryPi Foundation repository from being used.
+
+- **disableusbimages**: Prevents OSes stored on local USB memory devices from being used.
+
+- **disablesdimages**: Prevent OSes stored on the SD card from being used.
+
+- **no_group**: Prevents the list of OSes from being grouped into categories.
+
+- **no_cursor**: Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
+
+- **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. (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
+
+- **configpath=**: Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/\/)
+
+- **background=\**: To change the background colour for the screen and most windows, add `background=r,g,b`, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
+
+- **wallpaper_resize**: Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop. As an alternative to 'background', a small (8x8) png file can be used to fill the desktop only with a particular colour, leaving the background of the other windows alone.
+
+- **style=**: The style of the windows display can be modified to one of `motif`, `windows` or `platinum`
+
+
+
+- **dsi**: A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
+
+
+The recovery.cmdline can be edited using the [Edit Config](#easy-config-file-editor) option on the maintenance menu. From v3.2, this now includes an Edit Options button which launches a dialog to set all the options more easily using simpler checkboxes.
+
+---
+
+# Installing OSes
+
+## OS Installation
+
+Simply select the checkbox next to each OS you want to install, using either a mouse or keyboard (use the arrow keys to traverse the list; the Enter or Space key 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), USB device (USB icon) or from the online OS repository (Ethernet icon).
+
+_Some OSes may require some terms and conditions to be accepted before the OS can be installed._
+
+
+
+*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 the installation sources.
+
+### File Signatures and Checksums
+
+OS maintainers have the option of providing signatures or checksums for their main OS tarballs/images and their partition_setup.sh script. These may be of type sha512sum, sha256sum, sha1sum or md5sum. When PINN sees such a signature it will verify the downloaded file against its signature for correctness and an error will result if they differ.
+
+When a checksum error occurs during installation, 4 options are available:
+
+- **keep** - Keep the current file and continue, but the OS will be marked as non-bootable
+- **retry** - retry the file again
+- **discard** - discard this file, but continue with any other OSes
+- **abort** - Abort all OSes
+
+When OSes are installed, the checksums are calculated during the installation, but for downloads and backups they are calculated at the end.
+
+Checksums can be found in each partition section of the `partitions.json` file for tarballs, and in `os.json` for the `partition_setup.sh` script.
+
+The keys: "sha512sum", "sha256sum", "sha1sum" and "md5sum" indicate the type of the checksum and its value is the checksum expressed as a quoted Hex string. Alternatively, the checksum value can be the URL of a standard digest file, being the captured output of one of these checksum programs.
+
+## OS Network Installation
+
+PINN allows additional operating systems to be downloaded from a remote repository. To do this, the Raspberry Pi must be connected to a wired network, or it can connect over Wi-Fi using the [Raspberry Pi USB wifi dongle](https://www.raspberrypi.org/products/usb-wifi-dongle/) or the Raspberry Pi 3 Model B built-in Wi-Fi.
+
+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 PINN directory and append `showall` to the arguments list.
+
+Once PINN has connected to your network, the IP address of the PI is shown in the window title bar.
+
+### How to install OSes from an alternative network sources
+
+If your Pi is connected to the Internet, PINN will present a list of OSes that are available for installation from the internet. By default, this list includes all of those available through the Raspberry Pi website, plus some others that have been converted specifically for PINN through the repo_list cmdline option.
+
+PINN provides many options to customise the list of repositories that it will use for sources of OSes by using the following recovery.cmdline options:
+
+- If no specific cmdline option is given, PINN will use the list on the Raspberry Pi Website.
+
+- **no_default_source** will prevent the OSes on the Raspberry pi website from being used.
+
+- **alt_image_source=** specifies an alternative source of OSes that can be installed from the internet. For example: alt_image_source=http://newurl.com/os_list_v3.json where `newurl.com` is the name of the alternative server and `os_list_v3.json` is the list of information about the alternative OSes. This list of OSes will be added to the default download list. This can be useful for storing the default repository on a local LAN server, or for adding your own list of OSes to those available in PINN. Multiple alternative repositories can be specified by including this option multiple times with different URLs.
+
+- **repo=** option from NOOBS is supported by PINN. Using `repo` will replace the default RPF server repository, whereas `alt_image_source` simply adds a repository. To add multiple repositories add multiple space-separated urls to the single "quoted" repo option.
+
+- **repo_list=** is used by default as it is a convenient way to support multiple repsositories by specifying one URL that points to a JSON file containing a list of other repositories. This makes it easier to maintain the OS list remotely for a set of users, rather than editing it manually on each Pi. For testing purposes, including a `repo_list.json` file on the PINN recovery partition will override any cmdline option and will be read instead.
+
+## Local Images on SD card
+
+PINN can install local images that are found in the `/os` folder on the SD card. These can include any of the original NOOBS images or any other OS that is formatted with a `.tar.xz` file for each partition.
+
+Whilst this can be a convenient way to host the installable images as they can be installed offline, it does take up some valuable SD card space, so installing from USB is often better.
+
+The easiest way to put OS installation images on the SD card is to first [download](#download) them to a USB stick and then copy the appropriate folder from the USB drive to the SD card.
+
+Make sure to add any OSes to the `/os/` folder before you boot PINN in a RPi for the first time. Otherwise you will find the partition has been shrunk to its minimum size and there will be no room to add any more OSes to the card later. However, by adding the `reserve=` option, it is now possible to reserve some free space on PINN's 1st FAT partition for storing OS images on later, or for general transfer of data to/from a Windows PC.
+
+## Local Images on USB stick
+
+Due to the increasing size of OSes, it is becoming increasingly difficult to store their compressed installation files on the PINN SD card. PINN-lite contains no OS installation files by default, but you can copy selected OSes into the `/os` folder if you wish.
+
+To counter this lack of SD card space, PINN supports storing the compressed OSes on a USB stick as well. This has the following advantages:
+
+ 1. The OSes are available to install when a network is not available.
+ 2. They do not take up any valuable space on the SD card.
+
+The OSes should be stored on the USB stick in the same format as they would be on a PINN SD card (please see the [download](#download) section):
+
+ 1. Each OS should be stored in its own folder beneath the `/os` folder.
+ 2. They should contain compressed images of their partitions in `.tar.xz` format
+ 3. All supporting JSON files (etc.) should also be included.
+
+If the same OS is available on the SD card, the USB stick, and the network, only the most recent version will be displayed.
+
+## Installing TO a USB device
+
+There are three ways for PINN to install an OS, which also depends on the RPi model you have:
+
+1. Install to the SD card
+2. Install the boot partition to the SD card and the rootfs to the USB device
+3. Install the boot and rootfs partitions to the USB device.
+
+_NOTE: PINN can only install the boot partition of an OS to the same drive that PINN is stored on. So for option 3, the USB drive must have PINN installed on it and the Pi must be booted from this drive._
+
+### Option 1: Install to the SD card
+
+This is the normal way to use PINN. PINN is stored on the SD card, is booted and installs the OSes to the remainder of the space on the SD card.
+
+### Option 2: Boot on SD card, Rootfs on USB
+
+There are several reasons why you may want to install an OS to a USB memory device: more capacity, more resilience, faster read/write operation and so on. PINN allows the rootfs to be installed to a USB memory device. However, the boot partition is kept on the SD card, so this technique is applicable to all RPi models.
+
+1. Follow the basic instructions to format your SD card and install PINN on it.
+2. Boot your Pi with the PINN SD card.
+3. Insert a USB memory device (USB stick, hard disk etc) into the Pi). Make sure it has nothing of value on it because it will be erased and reformatted.
+4. Select the new USB device in the dropdown box in the lower status window as the drive to install to and you will be prompted to format the device. Select Yes to continue.
+5. Install the OSes you require as normal.
+
+Using this technique you will always need to boot from the PINN SD card.
+
+### Option 3: Boot and Rootfs on USB
+
+This option is only applicable to RPi models based on the BCM2837 chipset (RPi3B and RPi2Bv1.2) which have the facility to boot directly from a USB device. However this mode must be enabled first, which can be done by following the instructions at: https://github.com/raspberrypi/documentation/blob/master/hardware/raspberrypi/bootmodes/msd.md
+
+Once USB boot mode is enabled, proceed as follows:
+
+1. Format the USB device as FAT 32 and copy the PINN files to it, just as you would for a normal PINN installation on an SD card.
+2. Boot PINN on the Pi from the USB device.
+3. Install your requried OSes as normal.
+
+## Project Spaces
+
+Project Spaces are empty OSes that just consist of an empty 100MB FAT32 partition and an empty 500MB nominal ext4 partition. Up to 8 Project Spaces can be installed onto an SD card along with any other OSes. Any remaining space left on the SD card will be divided up between all of these Project Spaces, so their ext4 partitions will expand to fill the remaining space and they will all be the same size.
+
+
+
+
+Project Spaces are useful when used with the [Replace](#replace-individual-os) OS function, as they reserve OS space that can be used later. The 3 main benefits are:
+1. They reserve OS space, so the choice of which OS to install or add can be made later on.
+2. They allow multiple instances of the same OS to be installed.
+3. They allow the same amount of space to be used for each OS.
+
+When replacing a project space with another OS, remember that the new OS must have the same number of partitions as the project space and each partition must fit within the existing partition sizes. So creating 8 project spaces on a 16GB card may not be very useful as there will be <2GB left on each of the ext4 partitions. That maybe ok for some of the minimal OSes, but no good for a full Raspbian installation, for example.
+
+## PINN's Firmware Upgrade/Downgrade
+
+PINN v2.5.3+ includes new firmware, kernel and drivers to support the new Pi3B+ model. Whilst this firmware will allow PINN to run on all RPi models, some older OSes may not yet be compatible
+and will not boot from PINN. So when booting on models older than the 3B+, PINN's firmware can be downgraded so that these older OSes can still boot from PINN.
+Prior to v3.2.4, On first startup on an older RPi model, PINN will automatically downgrade the firmware. It will need upgrading manually if you want to use the latest firmware.
+From v3.2.4 onwards, the automatic downgrade has been removed and it must be downgraded manually if required.
+
+Once PINN's firmware has been downgraded, it will no longer run on the RPi3B+. To run it on a RPI3B+ again it is first necessary to upgrade the firmware on an older model.
+There is a menu item on the Archival menu to upgrade or downgrade PINN's firmware accordingly. it is disabled on the RPi 3B+
+
+## OS firmware upgrade
+
+When PINN is running on upgraded firmware for the RPI3B+, it will try to upgrade the firmware of any OS that is installed, if it is too old to run on the RPi3B+.
+This may allow the OS to boot, but the Ethernet, wifi and USB may not work unless the drivers for these devices are upgraded.
+If this is not required, the `nofirmware` option can be used to prevent the firmware from being upgraded.
+This firmware upgrade feature is disabled when downgraded firmware is in use.
+
+Many OSes that support the Pi3 will need updating to support the new Pi3B+ model, so the list of available OSes for this Pi3B+ may be limited for a while. Adding the `showall` option may allow them
+to be selected, and PINN's new firmware upgrade feature may allow them to boot, but the kernel and drivers will still need to be updated to allow the new hardware features to be used.
+
+## How to Automatically Install OSes
+
+### Auto-Installing one OS
+
+Even if you are using your Pi without a display, you can still use PINN to easily install an OS of your choice. To set up PINN to install a specific OS automatically and silently (i.e. without requiring any user input), follow these steps:
+
+1. Copy the OS folder for the OS you want to install into the `/os` dir (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 entry for the flavour that you want to install.
+3. Edit the `recovery.cmdline` file in the root PINN directory and append `silentinstall` to the arguments list.
+
+When you now boot your Pi using an SD card containing the modified version of PINN that you just created, it will automatically install the OS you chose and boot into it after the installation has finished.
+NOTE: `Silentinstall` only works if there are no OSes installed already to prevent accidental OS deletion.
+
+From v2.8.5 onwards, the network is always enabled, even when `silentinstall` is specified. So it may be necessary to temporarily disable any network sources whilst the `silentinstall` option is being used to prevent remote OSes from being listed, which would cause `silentinstall` to fail. YMMV.
+
+### Auto-Installing several Named OSes
+
+The `select=` option can be used to provide a comma separated list of one or more OS names that should be selected automatically. Ensure the whole argument to Select is enclosed in quotation marks.
+Normally, any installed OS is automatically checked, but this will not happen if the `select=` option is present. To restore this behaviour with the `select=` option, add `allinstalled` as a special flag.
+
+e.g. `select="Raspbian,LibreELEC_Rpi2,allinstalled"
+Will install the Raspbian and LibreELEC OSes, plus any OSes that are already installed.
+
+If a particular OS you want to install is on a particular source, you can force PINN to wait until that source has been listed by adding additional flags:
+`waitsd` will wait for all OSes on the SD card to be listed.
+`waitusb` will wait for all OSes on a USB drive to be listed.
+`waitnetwork` will wait for all OSes on remote OSes to be listed.
+`waitall` is a shorthand way of including all OSes and is equivalent to `waitsd,waitusb,waitnetwork`
+
+PINN only carries out the OS selection once all sources are present. So if you wait for a source that is not present, PINN may wait indefinitely until it appears.
+This is modified in v2.8.5.1 to try and avoid indefinite waits. However, adding a `networktimeout=0` option will wait indefinitely for the network to be present before silently installing.
+
+The `select=` option only determines which OSes are selected in the recovery menu at startup; it will not do anything with the listed OSes by itself.
+By adding the `silentinstall` option as well, then all selected OSes will be silently installed without user intervention. However, `silentinstall` only works
+if there are no OSes installed already to prevent accidental OS deletion.
+It is also used with the `silentreinstallnewer` option, but this has fewer safeguards. Please read the warnings below.
+
+Unlike using `silentinstall` on its own to install a single local OS, when using it with the `select=` option, PINN must read in all installation sources,
+so the recovery menu MUST be entered for this to occur. You can do this by using one of the many trigger options at startup, e.g. pressing the shift-key.
+For remote operation, consider using the `forcetrigger` option, maybe in combination with `remotetimeout` if necessary.
+
+### Auto-Installing OSes based on their source
+
+If you want to select all OSes present on the SD card, USB stick, or on a remote repository, then the following flags can be used for the `select=` option respectively:
+`allsd`, `allusb` or `allnetwork`. Each option also implies the corresponding `waitsd`, `waitusb` or `waitnetwork`.
+
+Note that when OSes exist on multiple sources, PINN selects the most recent one (or the local one if they are equal).
+So, for example, if 'allnetwork' is specified and you expect a remote Raspbian OS to be installed, it will not be if a more recent version exists locally, because the remote OS will be overridden by the newer local version. If you want a particular source of an OS to be installed, it may be necessary to hide the other sources using disableusbimages, disablesdimages, or disabling the remote repositories respectively.
+
+The `select=` option will not install the listed OSes by itself, but by adding the `silentinstall` option as well, then all selected OSes will be silently installed without user intervention. However, `silentinstall` only works if there are no OSes installed already to prevent accidental OS deletion.
+
+## Installer Slideshow
+
+An installer slideshow guides you through your first steps with each OS while it installs.
+
+
+
+### Auto-Reinstalling OSes
+
+The `silentreinstallnewer` option is added by particular request for a specific purpose, so be sure you understand how it works before using, otherwise you are at risk of
+losing your data.
+
+It is used in conjunction with the `select=` option to automatically reinstall any installed OS selected by that option if a newer version is found to exist
+on any installation source that is newer than the currently installed version. THERE ARE NO OTHER CHECKS except the name of the OS and its release date, so this option may
+unexpectedly wipe out any existing OS and restore it to a factory default state if you make a mistake - YOU HAVE BEEN WARNED!
+For this reason, it may be beneficial to install a Data Partition on your installation drive, on which all user data is stored, rather than storing it on the OS partition.
+In this way, the user data can be preserved when the OS is re-installed.
+
+It is advisable to only use named OSes in the `select=` option. Using any of the general options like `allinstalled` & `allnetwork` etc. May result in unexpected consequences!
+Likewise, you may wish to restrict your installation sources to a single location with judicious use of the `disableusbimages`, `disablesdimages` and the network source options
+to avoid a newer OS being installed from an unintended source.
+
+## Installation Progress
+
+During the installation of the operating systems, PINN will write the percentage completed to a text file called `/tmp/progress`. The format of this file is an integer (0-100) followed by a space, a '%' symbol, and a line feed. It is only updated when the progress changes by at least 1%. Sometimes PINN will not know the maximum size; in this case, it shows the amount data written in MBs.
+This feature mimics the progress dialog on the display and is useful in headless setups to monitor the progress of the installation.
+
+## Background shell script
+
+To make use of the installation progress feature, a background shell script can be used. If a `/background.sh` script exists, it will be executed in the background whilst PINN runs. This can be used to read the `/tmp/progress` file and display the progress on the serial port, a GPIO-based display, etc. amongst other things.
+
+## Initialisation shell script
+
+If a script called /pinn_init.sh exists in PINN's recovery partition, it will be executed before PINN is started.
+This script will be mounted as /tmp/media/pinn_init.sh and must complete before PINN starts.
+It can be useful to initialise third party display drivers before the main PINN splash screen is shown.
+
+---
+
+# Booting an OS with PINN
+
+There are several ways of controlling the boot process and determining which OS gets booted.
+
+When PINN is booted, it displays a splash screen which provides enough time for the user to interrupt the boot process and go to the PINN recovery mode. The user may press the shift key, touch the logo on the touchscreen, press the left mouse button, or any recognised TV remote button when using the CEC interface to interrupt the boot process.
+
+The recovery mode will also be entered if no OSes have been installed, the `forcetrigger` is used or the GPIO trigger is used. Otherwise PINN will continue to boot one of the installed OSes
+
+## Booting a single OS
+
+If only one OS is installed, the boot selector will not be displayed and the OS will boot automatically.
+
+## OS Boot Selector
+
+After multiple OSes have been installed, a boot selection dialog is presented to list all the installed OSes for the user to choose one to boot. PINN will remember this OS choice and boot this OS by default each time unless a different option is selected within a timeout of 10 seconds. It is possible to change this menu timeout by adding `bootmenutimeout=X` in the `recovery.cmdline` file, where `X` is the desired timeout in seconds.
+
+A Boot button has been added for easier selection with limited CEC TV remotes, mice or touchscreens.
+Also a Cancel button (Shortcut=Esc) is provided to boot back into PINN again.
+
+
+
+## Sticky Default OS
+
+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. 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.
+
+## OS Boot selection order
+
+The order of the OSes presented on the boot selection dialog is dependent on their physical position on the drive, essentially the order they were installed. Using the up and down buttons, any selected OS can be moved up or down in this list, and hence the order can be changed to suit your needs.
+
+### Reboot shell script
+
+Just before PINN boots into the selected OS, it will execute
+`/before-reboot.sh` if it exists. A typical example for this script is to turn off the backlight of the Raspberry Pi 7" touch screen display. Be aware that any such script here must execute and finish before PINN will continue to boot the selected OS.
+
+
+## How to bypass PINN and boot directly into a fixed partition
+
+PINN provides many administration functions to assist you in installing, maintaining and booting multiple OSes. But to do this, it does slow the boot process down a little to allow time for the user to interact with the boot process. But even if you have installed multiple OSes, there may be times when you would like the Pi to always boot into one specific OS as quickly as possible and hide PINN completely.
+
+After you have installed your chosen OSes, add the following file to the root directory of PINN to force a specific OS to be booted each time.
+
+1. Add a text file named `autoboot.txt` to the root directory of PINN.
+2. Add `boot_partition=` to the file and save it to disk.
+
+The is the partition number of the boot partition of the OS you want to boot at each power on. The partition number can be found by running `sudo fdisk -l`. The partition will be one of the FAT32 partitions e.g. `/dev/mmcblk0p6` would be partition 6. It can also be found by looking at the installed_os.json file on the settings partition (partition 5) of the device that PINN is installed on. This will also prevent the splashscreen from being displayed at boot.
+
+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
+
+## Online Help via Web Browser
+
+The built-in Arora web browser allows you to easily get help via the Raspberry Pi Forums (network connection required).
+
+
+
+## Info on OS
+
+The Info button will take you to the web page specific to the currently highlighted OS in the selection list (network connection required).
+
+
+
+## Clear
+
+The clear button will de-select any selected OSes either in the available or isntalled lists. On startup, PINN will auto-select any installed OSes, but this may be overridden
+by the select option. In any case, this button provides a quick way of de-selecting all OSes in case you want to start afresh, without having to track them all down in the
+various tabs and windows.
+
+## Exit
+
+The Exit button (Esc) will exit recovery mode and go to the boot selection dialog, or directly boot the OS if only one is installed. The Exit button is ony enabled if bootable OSes have been installed. If only data partitions or ProjectSpaces have been installed, for example, then it will be greyed out.
+From p3.2.4 It is also possible to exit to the boot selection dialog from the other menus by pressing the Esc key, even though there is no toolbar button available.
+
+---
+
+# Archival Menu
+
+
+
+## Download
+
+As documented earlier, PINN can install an OS from a local USB disk instead of directly from the internet for use when no internet is available, or to avoid repetitive slow or costly downloads. But to do this, the OS and is accompanying meta-files must be downloaded from the internet to the USB drive. PINN's `download` feature allows this task to be done easily. It will only download OSes that are sourced from the network - selected OSes on a USB stick, for example, will be ignored.
+
+You will be asked if you want to resume partial downloads. Only select this option if a previous download failed and you wnat to continue downloading the same file rather than starting again. Selecting Yes when no partial downloads are available could end up extending an existing file with a newer file, causing a problem.
+
+
+
+1. Format a USB drive as FAT32,ext4 or NTFS and create an `/os` folder on it.
+2. Insert the USB drive into the Pi.
+3. On the Archival Menu, select the USB drive in the status window.
+4. Select the list of OSes you want to download
+5. Select the Download button and wait for the OSes to download.
+6. Prior to v3.0.1, PINN will need rebooting to recognise and add these new OSes, but this is no longer necessary.
+
+The download icon is only available when the download size of all files are known. If the download icon is greyed out, and the toolbar indicates that that there are still more files to check, please wait until all files are checked.
+
+The download function will also download OS flavours and their customisation files from a remote repository. When downloading flavours, it is only necessary to download 1 of the flavours and all associated flavours will be downloaded. (OSes that have flavours should include all their additional flavour customisations in a single flavours.tar.xz file to allow for their download).
+
+After a file is downloaded it is checked against its signature checksum, if one is available. See [File Signatures and Checksums](#file-signatures-and-checksums)
+
+_Some OSes may require some terms and conditions to be accepted before the OS can be downloaded._
+
+## How to Clone an SD Card
+
+Raspbian has added an SD Card Copier tool called `piclone`, which is great. For anyone concerned about it cloning a live system,
+it has now been ported into PINN so that it can clone the SD card offline, whilst the OS is not running.
+
+
+
+1. On the PINN screen, select the new `Archival` toolbar by pressing the `More` button.
+2. Insert a second SD card into the Pi using a USB card reader.
+3. Select the Clone SD card button.
+4. Select your internal SD card as the source (/dev/mmcblk0) and the SD card in the USB reader as the destination (usually `/dev/sda`).
+5. Select OK to clone your SD card.
+
+All partitions will be copied onto the second card whilst the last partition will be sized to fit the remainder of the SD card.
+In this way, your existing data can be migrated to a smaller or larger SD card.
+
+_Note1: that if you have installed multiple OSes using PINN, only the last partition of the last OS on the SD card will be resized._
+_Note2: The clone function can also be used to copy any USB drive to any other USB drive - it doesn't have to incldue the SD card at all._
+
+## Set Time
+
+The Raspberry Pi has no real time clock, but it needs to know the correct time for https transfers and to timestamp any backups.
+The Pi's clock can be set automatically once it is connected to the internet, but this function can be used to set the clock manually if no internet connection is available.
+If a backup is attempted with no internet connection, this function will be called first to ensure the current time is set.
+
+
+---
+
+# Maintenance Menu
+
+
+
+The maintenance toolbar contains commands to execute on installed OSes only, so the main window will only show a list of those OSes that are installed.
+
+The first entry is a dummy fixed entry called `PINN` which represents the PINN recovery partition. This enables the same toolbar commands to be carried out on the PINN recovery partition, such as doing a file system check or editing recovery.cmdline or config.txt files. Of course, changing the password will have no effect.
+
+## Easy Config File Editor
+
+The built-in config file editor allows you to edit the config file of the OS that is currently highlighted in the OS list. This allows you to easily add license keys to different OS installs through the same interface.
+
+When the PINN entry is selected, it allows you to edit the recovery.cmdline instead of the cmdline.txt file. A button called "Edit Options" will also appear which can launch a dialog box with all the possible options laid out amongst 4 tabs. This means you no longer need to remember all the option names as check and edit boxes are used instead.
+
+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.
+
+
+
+## How to Recover from a lost password
+
+If you have changed your login password for an OS and forget what it is, PINN will allow you to reset it back to its default or set it to a new value.
+
+
+
+1. On the PINN screen, select the new `Maintenance toolbar` by pressing the `More` menu.
+2. highlight the installed OS that you want to reset the password in.
+3. Selecting the Password button will display a dialog box to enter the new password details.
+4. Enter the username you want to change the password of.
+5. Enter the new password (twice). Both copies must match. The second will be displayed red if it is different.
+6. The password strength meter is a useful indication of how good a password you have created.
+7. The `Use Default` button will enter the default username and password for the selected OS.
+8. Tick the `show password` box to display the passwords on the screen.
+
+## Backup
+
+The backup function allows an installed OS to be backed up to a USB drive. The USB drive must first be formatted as FAT32, ext4 or ntfs and have a /os folder on it to store the backups in, otherwise it will not be recognised.
+
+Select all OSes to backup and then click the backup button. After a confirmation dialog, OSes that are not suitable for backing up will be indicated in a dialog box and deselected. These currently include Risc OS, XBian and Win10 IoT. Some other OSes have required modified setup scripts in order to restore them properly after backing up. If you are trying to backup an OS that was installed prior to this modification, PINN will try to install these modified files from an installable source. So to backup such an OS it may be necessary to connect the RPi to the internet or plug in a USB stick with the OS installation files on it.
+
+When an OS is backed up, it is given a name that includes the current time as a suffix in the format #YYYYMMDD-HHMMSS so that backups can be readily identified. If the RPi does not know the current time because it is not connected to the internet, you will be prompted to enter the current time. PINN gives you the opportunity to change this suffix and alter the OS description in the next dialog.
+
+This Backup feature is also useful to create Custom OS versions that can be installed by PINN or NOOBS onto other systems.
+
+OSes are backed up in NOOBS/PINN format as .tar.gz files. These do not compress as well as .tar.xz files, but require less memory and can be created faster on the RPi.
+Nevertheless, compressing tar files is still a processor intensive task, so backing up an OS will take a lot longer than installing an OS, especially on some of the less powerful RPis.
+Due to the compression, it is not known precisely how much disk space is required to store the backup, so PINN makes a conservative guess of 33% of the original size. It may require more or less than this amount, but if less disk space is available, a warning message is displayed, but the backup may continue if you wish. If there is insufficient disk space to complete the backup, this should be indicated. (You can also check the log in /tmp/debug for any errors.)
+
+**Backups should be thoroughly tested that they are valid and restorable before relying upon them. This is a new PINN feature and every effort has been made to ensure it works as expected, but the author accepts no liability or responsibility for loss of data.**
+
+After backing up an OS prior to v3.0.1, it may not show up in the list of installable OSes until PINN is rebooted, but now it will appear immediately in a separate "Backups" tab with all the other backup versions.
+
+When an OS is backed up, an sha512sum signature checksum is calculated for each tarball which will be used to verify its correctness when next installed. See [File Signatures and Checksums](#file-signatures-and-checksums)
+
+
+## Restoring Backups
+
+There is no specific "Restore" button to restore a Backed up OS. As the backup is aready in NOOBS format, the backed up OS can be installed as any other OS to a fresh (PINN format) SD Card or USB drive, or they can be used to replace an existing OS or ProjectSpace (if it is in a compatible partition layout).
+
+When a backed up OS is restored, PINN will fix up partition references by running the partitions_setup.sh script. However, certain tasks in that script that are only needed on an initial install will be skipped, as it is assumed they were already done and are not needed on restoration. This also includes the copying of ssh and wpa_supplicant.conf files from the PINN partition. Flavour customisation scripts are also not executed.
+
+Backed up OSes may be installed by NOOBS, but some OSes may not restore properly due to the need for modified setup scripts (see above) that NOOBS is not aware of.
+
+## How to Fix an OS
+
+If your installed OS will not boot, the Fix option in the maintenance menu may help. It provides a list of operations that you may perform to fix the OS. Check all operations that you want to be performed on your selected OSes.
+
+
+
+### File System Check
+
+Most RPi OSes typically delay writing any data back to SD or USB drives for performance reasons. Normally, this does not cause a problem provided the Pi is shutdown properly before removing the power, but this is not always possible. You may experience a power loss, or a program crash where pulling the power is your only recourse to recovering control. In these circumstances there is a risk that the SD card or USB drive may become corrupted if some data failed to get written to the drive before the power was lost.
+
+To recover from a corrupted drive, PINN includes a file system check option which will perform an `fsck -y` command on all partitions of the selected installed OSes. The output of the `fsck` command will be shown in a dialog box that can be scrolled to check the result. If it shows that recovery was unsuccessful, you may need to use more advanced disk recovery tools to fix the problem. Since this check option will work on multiple OSes, it is necessary to select the checkbox of each OS you want checked, otherwise no OSes will be checked. If you are paranoid, you may want to make a backup of any affected partitions before trying this fsck option.
+
+
+
+### Re-run partition_setup.sh
+
+Installed OSes may be upgraded using their standard upgrade procedure (e.g. sudo update;sudo upgrade etc.). However, some OS upgrade procedures may not be aware that they are running in a multi-boot environment and may break the changes PINN made to allow them to work. In this situation, re-running the OSes partition_setup.sh script should fix-up these changes to allow the OS to boot properly. From v3.0, PINN will now skip initial installation tasks in this script and it is restricted to fixing up partition references.
+
+## Reinstall Individual OSes
+
+The `install` function will install one or more OSes to your drive, allowing a multi-boot configuration. However, all selected OSes must be installed at the same time as it will repartition and format the drive prior to installing the OSes, thus wiping out any previous installations.
+
+The `Reinstall` option gets around this by allowing individual installed OSes to be over-written with the latest version of the corresponding OS, leaving all other OSes intact. As it does not repartition the drive, the new OS must fit within the same partition sizes as the OS occupied the last time it was installed.
+
+PINN itself is included in the list of installed OSes. If it is the ONLY OS to be selected, reinstalling it will perform a manual self-update check which is useful in the case where the `no_update` cmdline option has been used.
+
+## Replace Individual OSes
+
+The `replace` function will allow the replacement of an installed OS with another different OS, provided the number of partitions in the two OSes is the same and the new OS will fit within the existing partition sizes. So it will work with most OSes, but not for those that use a non-standard partition layout. Windows IoT and RiscOS are specifically excluded and it is unlikely many Android versions witll work, but your mileage may vary. Any other installed OSes will remain unaltered.
+
+This is particularly useful with the [Project Spaces](#project-spaces) feature, which will allow OS space to be reserved for installing an OS at a later date.
+
+To replace one or more OSes, first select the new OSes you want to install on the `Main Menu`. Then move to the `Maintenance Menu` and select the OSes (or project Spaces) that you want to be replaced and click the `Replace` button. A dialog box will pop up lsiting all the OSes to be replaced. Alongside each one is a drop down box, where you can select which new OS shall replace each installed OS. The Click OK to replace the old OSes with the new OSes.
+
+
+
+
+## Alias
+
+The `alias` function will allow an installed OS to be given an alias name, which can be used to rename an OS.
+When selected, a dialog box will open where the alias can be edited. The description of the OS can also be edited here.
+This can be useful to distinguish multiple copies of the same OS that have been installed using ProjectSpaces.
+
+---
+
+# Advanced Usage
+
+## 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 PINN:
+- 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 PINN from http://downloads.sourceforge.net/projects/pinn/pinn-lite.zip.
+2. Extract the PINN-lite 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:
+ * "name" - replace the name of the base OS with the name of your custom OS version
+ * "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:
+ * "partition_size_nominal" - replace the numerical value with the size of the paritions in your custom OS version
+ * "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 PINN - 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`.
+ * To create the root tarball, you will need to run: `sudo bsdtar --numeric-owner --format gnutar --one-file-system -cpf \_root.tar .` from within the root filesystem of your custom OS version. You should then compress the resulting tarball with `xz -9 -e \_root.tar`.
+ * To create the boot tarball, you will need to run `sudo bsdtar --numeric-owner --format gnutar -cpvf \_boot.tar .` from the boot partition of your custom OS version. You should then compress the resulting tarball with `xz -9 -e \_boot.tar`.
+
+_More detailed instructions are available in the Wiki at https://github.com/procount/pinn/wiki/How-to-Create-a-Multi-Boot-SD-card-out-of-2-existing-OSes-using-PINN_
+
+Also note that if your custom OS is already on a PINN formatted SD card but you've made some changes that for example you want to install as a custom OS to other cards, then simply backing up the OS will create a custom OS version.
+
+## How to customise an OS install (noobsconfig)
+
+PINN can be used as a recovery program, so if your OS gets corrupted, messed up, or otherwise goes wrong, you can reinstall a clean version of the OS and start again. On the other hand, starting again from scratch can be painful, especially if you can't remember how you set up your perfect OS environment.
+
+Creating a custom OS version (see above) for your preferred setup is one option, but it can look daunting to do, and would need to be repeated if you want to update it to include the latest build of the OS.
+
+[Noobsconfig](http://github.com/procount/noobsconfig) is an alternative option that creates a customised OS by installing a standard OS, but then copies your own files over the top to add your own customisations according to your selected "flavour". These additional files are specified in a simple text file that controls their installation. For example, these can be simple configuration files, workshop exercises, tutorials, or Wi-Fi setup files. Alternatively, they could be scripts that are configured to run on first boot to further configure your OS by automatically installing your favourite packages.
+
+By keeping the customisations separate from the OS distro means:
+
+1. A custom installation can be created out of a standard OS installation plus some additional files, without having to create a full customised OS.
+2. The same customisations can be applied to a newer version of the standard OS installation without having to rebuild a custom OS installation.
+3. By using simple configuration files, it is easy to add files to configure your OS.
+4. Different customisation "flavours" of an OS can be created as a master installation card, and the required ones can be selected and installed as required. This can save a lot of SD card space compared to storing a different full customised OS for each flavour.
+
+PINN now includes direct support for `noobsconfig`, so it is no longer necessary to add the `noobsconfig` files to your PINN installation. Just add your configuration and customisations files and install your "flavoured" OS. Please see (https://github.com/procount/noobsconfig) for full documentation on how to use this feature.
+
+The `configpath` command line option will cause PINN to search for the customised files in another location (folder or URL) rather than the same location as the os_info.json file for the OS, but this will affect ALL OSes.
+
+The [PiKitchen](http://www.pihardware.com/guides/pi-kitchen) is an example of how comprehensive these configurations can be if you want them to be.
+
+## How to auto-switch HDMI/DSI screen configurations
+
+If an HDMI and a DSI screen (such as the Raspberry Pi Touch Screen) are both connected to the Raspberry Pi, the selection of which screen is to be used as the default needs to be selected in the `config.txt` file, which means constantly having to change `config.txt` to match whichever screen is required. This is because the DSI screen can only be selected at boot time, although without *any* configuration, the GPU will select the DSI screen in preference to the HDMI. PINN provides some limited ability to reverse this priority.
+
+This use case assumes that the DSI screen is always connected, and is normally used. But if an HDMI screen is connected, then the display will automatically switch to it.
+
+1. Create a `config.txt` file in the PINN root partition. Ensure it has the line `ignore_lcd=1` to disable the DSI screen and select the HDMI screen.
+2. Edit `recovery.cmdline` and add the `dsi` keyword.
+3. In the boot partition of any installed OS, create a `config.dsi` file to configure the DSI screen, and a `config.hdmi` file to configure the hdmi screen. (This can mostly be setup using a custom flavour with the `noobsconfig` feature so it can be installed automatically.)
+
+When PINN boots, the HDMI screen will be selected, so to use any PINN feature, an HDMI screen **must** be connected.
+
+PINN will automatically boot the last selected OS after it times out. If a HDMI screen is attached, PINN will copy the `config.hdmi` file to `config.txt` on the selected OS and reboot into it.
+
+If an HDMI screen was not detected, PINN will copy the `config.dsi` file to config.txt on the selected OS and reboot into it.
+
+When using this technique, do not make any modifications to config.txt directly otherwise they will be overwritten by PINN on next boot. Instead, modify the appropriate config.dsi or config.hdmi file.
+
+### Automatic Screen Detection
+
+From v3.1 PINN includes automatic screen detection amongst HDMI, DSI and Pimoroni Hyperpixel screens. To enable this feature, download screenswitch.zip and unzip to the PINN recovery partition. This includes some config.txt files for the various screens and a pinn_init.sh script to detect and switch the screen configuration. The idea is that no matter which of these screens is fitted, PINN will always be able to make its display visible.
+
+In the case where mutiple screens are attached at the same time, enter your preferred screen on the first line of `screenpref` as hdmi, dsi, hyp3 or hyp4 and PINN will attempt to select this one.
+
+When PINN detects a different screen is fitted, it will reconfigure itself and reboot to make this take effect, so it takes slightly longer to boot in this instance.
+
+Whilst the Hyperpixel screens and the HDMI monitor can nearly always be detected, the RPF DSI Touchscreen is sometimes not detectable, or hidden, depending on the current configuration. In this case it may be necessary to remove some displays and/or switch to HDMI mode in order to detect the DSI touchscreen and then switch to it.
+
+Whilst using this screen detection technqiue, do not edit config.txt, but rather change the config file for the appropriate display. Also do not change the first line of each config file as this is used by the script to detect the current configuration.
+
+---
+
+# Troubleshooting
+
+## What to do if your SHIFT keypress isn't detected
+
+Try pressing shift only when the grey splash screen is displayed, rather than holding it from boot up.
+
+## 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 PINN directory.
+2. Reboot.
+
+Note that with this option enabled, the Recovery Mode will be displayed every time you boot from your PINN 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 PINN 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 PINN directory.
+2. Reboot.
+
+## How to enable using the GPIO to trigger entering Recovery Mode
+
+To force Recovery Mode to be entered on boot and to show the PINN 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 PINN interface to be displayed on boot:
+
+1. Append `gpiotriggerenable` to the argument list in the `recovery.cmdline` file which is found in the root PINN 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 boot into "Safe Mode"
+
+To boot into a basic busybox shell rather than launching the PINN GUI, you can *either*:
+
+1. Append `rescueshell` to the argument list in the `recovery.cmdline` file which is found in the root PINN directory. Exiting from this shell will now enter the PINN recovery program.
+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 PINN directory).
+
+## Debug Information
+
+PINN produces a debug log which can be helpful if something goes wrong. Please see the [troubleshooting guide](https://github.com/procount/pinn/wiki/Troubleshooting) in the wiki on how to access this and waht to do if you suspect a bug.
+
+---
+
+# FAQ
+
+Q1. After using the Wipe Disk command, PINN will halt "Waiting for the settings partition" on next boot.
+
+A1. Sometimes the repartitioning will not satisfy all constraints and fails. In this case, add `runinstaller` to recovery.cmdline and reboot. This will cause PINN to repartition the card again for use by PINN.
+
+---
+
+# How to Rebuild PINN
+
+Note that this will require a minimum of 6 GB free disk space.
+
+## Get Build Dependencies
+
+On Ubuntu:
+
+`sudo apt-get install build-essential rsync texinfo libncurses-dev whois unzip bc qt4-linguist-tools`
+
+Also needed is bsdtar v3.3.1 which can be built as follows:
+```
+wget https://www.libarchive.org/downloads/libarchive-3.3.1.tar.gz
+tar xzf libarchive-3.3.1.tar.gz
+cd libarchive-3.3.1
+./configure
+make
+make install
+
+if make install doesn't work (Raspbian), just copy bsdtar to /usr/bin.
+```
+
+## Run Build Script
+
+`./BUILDME.sh`
+
+Buildroot will then build the software and all dependencies, putting the result in the `output` directory.
+
+By default, buildroot 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 set up an SD card with a newly built version of PINN, 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 PINN (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 than when deployed on the Pi. You can
+raise the font sizes 2 points to compensate for this.
+
+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 built by buildroot:
+Type `cd buildroot ; make legal-info` to generate a list, which will be available under `output/legal-info`.
diff --git a/README_SUM.md b/README_SUM.md
index 4b72049c..ff527859 100644
--- a/README_SUM.md
+++ b/README_SUM.md
@@ -45,6 +45,17 @@ Please note that in some cases it may extract the files into a folder, if this i
## Change History
+### V3.2.4a
+
+-**Build** - Modified to build on Ubuntu 18.10 'cosmic'
+-**Progress** - Experimental modification to measure installation progress more accurately
+-**Wifi dialog** - Removed focus for better use by keyboard
+-**Zipfles** - Use bsdtar to unzip inline for checksums
+-**Esc** - Esc key exits all menus
+-**Firmware** - Don't automatically downgrade firmware
+-**Options** - Added shortcuts for better keyboard use
+-**GPIO** - Allows gpiochannel and gpiochannelValue to be specified to trigger the recovery menu
+
### V3.2.3
- **Customisations** - Fix bug introduced by backup preventing customisations.
diff --git a/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 00000000..e9dee48a
--- /dev/null
+++ b/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,50 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH 1/1] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ lib/fseterr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 82649c3ac..adb637256 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+--
+2.14.1
+
diff --git a/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 00000000..035f8282
--- /dev/null
+++ b/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,46 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fseterr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index adb637256..fd9da6338 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,8 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+--
+2.14.1
+
diff --git a/buildroot/package/bison/bison.hash b/buildroot/package/bison/bison.hash
index 16913f28..2c332085 100644
--- a/buildroot/package/bison/bison.hash
+++ b/buildroot/package/bison/bison.hash
@@ -1,2 +1,4 @@
# Locally calculated after checking pgp signature
sha256 a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 bison-3.0.4.tar.xz
+# License files, locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/buildroot/package/bison/bison.mk b/buildroot/package/bison/bison.mk
index 5779673e..e4fc5041 100644
--- a/buildroot/package/bison/bison.mk
+++ b/buildroot/package/bison/bison.mk
@@ -7,7 +7,7 @@
BISON_VERSION = 3.0.4
BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_LICENSE = GPLv3+
+BISON_LICENSE = GPL-3.0+
BISON_LICENSE_FILES = COPYING
HOST_BISON_DEPENDENCIES = host-m4
diff --git a/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 00000000..750b75f7
--- /dev/null
+++ b/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,165 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+---
+ lib/fflush.c | 6 +++---
+ lib/fpending.c | 2 +-
+ lib/fpurge.c | 2 +-
+ lib/freadahead.c | 2 +-
+ lib/freading.c | 2 +-
+ lib/fseeko.c | 4 ++--
+ lib/stdio-impl.h | 6 ++++++
+ 7 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index 983ade0ff..a6edfa105 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index c84e3a5b4..789f50e4e 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index b1d417c7a..3aedcc373 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index c2ecb5b28..23ec76ee5 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index 73c28acdd..c24d0c88a 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 0101ab55f..193f4e8ce 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h
+index 78d896e9f..05c5752a2 100644
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+--
+2.14.1
diff --git a/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 00000000..755984e3
--- /dev/null
+++ b/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,150 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fflush.c | 9 ++++++---
+ lib/fpending.c | 3 ++-
+ lib/fpurge.c | 3 ++-
+ lib/freadahead.c | 3 ++-
+ lib/freading.c | 3 ++-
+ lib/fseeko.c | 6 ++++--
+ 6 files changed, 18 insertions(+), 9 deletions(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN"
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index a6edfa105..a140b7ad9 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,8 @@
+ #undef fflush
+
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1)
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index 789f50e4e..7bc235ded 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,8 @@ __fpending (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index 3aedcc373..554790b56 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,8 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index 23ec76ee5..ed3dd0ebd 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index c24d0c88a..790f92ca3 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,8 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ , because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 193f4e8ce..e5c5172e7 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+--
+2.14.1
diff --git a/buildroot/package/m4/m4.mk b/buildroot/package/m4/m4.mk
index 9b5d2d1f..b08e3ff4 100644
--- a/buildroot/package/m4/m4.mk
+++ b/buildroot/package/m4/m4.mk
@@ -4,10 +4,10 @@
#
################################################################################
-M4_VERSION = 1.4.17
+M4_VERSION = 1.4.18
M4_SOURCE = m4-$(M4_VERSION).tar.xz
M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_LICENSE = GPLv3+
+M4_LICENSE = GPLv3.0+
M4_LICENSE_FILES = COPYING
HOST_M4_CONF_OPTS = --disable-static
diff --git a/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch b/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch
new file mode 100644
index 00000000..2448229b
--- /dev/null
+++ b/buildroot/package/ncurses/ncurses-5.9-gcc-5.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey"
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+ gcc introduced here:
+ https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+ https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+ (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ -e 's/gen_$//' \
+ -e 's/ / /g' >>$TMP
+
++cat >$ED1 < $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+- -e 's/ / /g' \
+- -e 's/^ //' \
+- -e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/buildroot/package/python/001-remove-host-header-path.patch b/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
similarity index 78%
rename from buildroot/package/python/001-remove-host-header-path.patch
rename to buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
index dfb84ffa..3b2c9833 100644
--- a/buildroot/package/python/001-remove-host-header-path.patch
+++ b/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
@@ -1,4 +1,7 @@
-setup.py: do not add invalid header locations
+From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:06 +0100
+Subject: [PATCH] setup.py: do not add invalid header locations
This piece of code incorrectly adds /usr/include to
self.compiler.include_dirs, and results in the following invalid
@@ -17,11 +20,15 @@ cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-
[...]
Signed-off-by: Thomas Petazzoni
-Index: b/setup.py
-===================================================================
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 54054c2..64001e2 100644
--- a/setup.py
+++ b/setup.py
-@@ -480,7 +480,7 @@
+@@ -496,7 +496,7 @@ class PyBuildExt(build_ext):
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
@@ -30,3 +37,6 @@ Index: b/setup.py
and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
+--
+2.7.4
+
diff --git a/buildroot/package/python/002-fix-get-python-inc.patch b/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
similarity index 76%
rename from buildroot/package/python/002-fix-get-python-inc.patch
rename to buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
index bfee03aa..b28ef244 100644
--- a/buildroot/package/python/002-fix-get-python-inc.patch
+++ b/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
@@ -1,4 +1,7 @@
-Fix get_python_inc() for cross-compilation
+From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:25 +0100
+Subject: [PATCH] Fix get_python_inc() for cross-compilation
When we are cross compiling, doing os.path.dirname(sys.executable) to
get the build directory is incorrect, because we're executing the host
@@ -21,11 +24,15 @@ This patch allows to fix the
incorrectly added to the header paths.
Signed-off-by: Thomas Petazzoni
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
+---
+ Lib/distutils/sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index de7da1d..d72b6e5 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ def get_python_inc(plat_specific=0, prefix=None):
if os.name == "posix":
if python_build:
@@ -34,3 +41,6 @@ Index: b/Lib/distutils/sysconfig.py
if plat_specific:
# python.h is located in the buildir
inc_dir = buildir
+--
+2.7.4
+
diff --git a/buildroot/package/python/004-sysconfigdata-install-location.patch b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
similarity index 64%
rename from buildroot/package/python/004-sysconfigdata-install-location.patch
rename to buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
index a72db1ae..db5bfe1a 100644
--- a/buildroot/package/python/004-sysconfigdata-install-location.patch
+++ b/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
@@ -1,4 +1,7 @@
-Change the install location of _sysconfigdata.py
+From 0ef0d4ddd3f2261e381f22061a9a451dfbb1dc9e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:17:59 +0100
+Subject: [PATCH] Change the install location of _sysconfigdata.py
The _sysconfigdata.py module contains definitions that are needed when
building Python modules. In cross-compilation mode, when building
@@ -16,12 +19,16 @@ this directory gets added to the PYTHONPATH of the host Python
interpreter when building Python modules for the target.
Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 12 ++++++++++--
+ configure.ac | 2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e288964..5367df7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -462,6 +462,9 @@
+@@ -529,6 +529,9 @@ pybuilddir.txt: $(BUILDPYTHON)
rm -f ./pybuilddir.txt ; \
exit 1 ; \
fi
@@ -29,9 +36,9 @@ Index: b/Makefile.pre.in
+ mkdir -p `cat pysysconfigdatadir.txt`
+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1002,7 +1005,7 @@
+ # This is shared by the math and cmath modules
+ Modules/_math.o: Modules/_math.c Modules/_math.h
+@@ -1080,7 +1083,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
else true; \
fi; \
done
@@ -40,7 +47,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1012,6 +1015,11 @@
+@@ -1090,6 +1093,11 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,25 +59,28 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1337,7 +1345,7 @@
+@@ -1418,7 +1426,7 @@ distclean: clobber
Modules/Setup Modules/Setup.local Modules/Setup.config \
Modules/ld_so_aix Modules/python.exp Misc/python.pc
-rm -f python*-gdb.py
- -rm -f pybuilddir.txt
+ -rm -f pybuilddir.txt pysysconfigdatadir.txt
- find $(srcdir)/[a-zA-Z]* '(' -name '*.fdc' -o -name '*~' \
- -o -name '[@,#]*' -o -name '*.old' \
- -o -name '*.orig' -o -name '*.rej' \
-Index: b/configure.ac
-===================================================================
+ # Issue #28258: set LC_ALL to avoid issues with Estonian locale.
+ # Expansion is performed here by shell (spawned by make) itself before
+ # arguments are passed to find. So LC_ALL=C must be set as a separate
+diff --git a/configure.ac b/configure.ac
+index 1273465..5f89797 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
-- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
-+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
+- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
++ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
fi
- elif test "$cross_compiling" = maybe; then
- AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
+ # Used to comment out stuff for rebuilding generated files
+ GENERATED_COMMENT='#'
+--
+2.7.4
+
diff --git a/buildroot/package/python/005-pyc-pyo-conditional.patch b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
similarity index 68%
rename from buildroot/package/python/005-pyc-pyo-conditional.patch
rename to buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
index 0a2f727b..3bf407d5 100644
--- a/buildroot/package/python/005-pyc-pyo-conditional.patch
+++ b/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
@@ -1,8 +1,22 @@
-Index: b/Makefile.pre.in
-===================================================================
+From 168e6c594e80395583de5ab0d082be119b2061fc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:18:57 +0100
+Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
+
+This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
+the compilation of pyc/pyo files.
+
+Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 8 ++++++++
+ configure.ac | 11 +++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 5367df7..96fc718 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1050,24 +1050,32 @@
+@@ -1128,24 +1128,32 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -35,11 +49,11 @@ Index: b/Makefile.pre.in
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 5f89797..4aafc82 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -736,6 +736,17 @@
+@@ -759,6 +759,17 @@ SunOS*)
;;
esac
@@ -57,3 +71,6 @@ Index: b/configure.ac
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
+--
+2.7.4
+
diff --git a/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
new file mode 100644
index 00000000..e0a24ec8
--- /dev/null
+++ b/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
@@ -0,0 +1,29 @@
+From 2d971c3cdca9ecc55f2da8aba12ca89e1a66519a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:19:47 +0100
+Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
+
+The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
+cross-compilation friendly.
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4aafc82..63e6918 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3527,7 +3527,7 @@ fi
+
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+
+-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ if test $ipv6 = yes
+ then
+--
+2.7.4
+
diff --git a/buildroot/package/python/007-disable-extensions.patch b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
similarity index 57%
rename from buildroot/package/python/007-disable-extensions.patch
rename to buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
index be4d9437..44a8ae2c 100644
--- a/buildroot/package/python/007-disable-extensions.patch
+++ b/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
@@ -1,8 +1,24 @@
-Index: b/Makefile.pre.in
-===================================================================
+From 977de9474c1fb46359ab6a487e153fbd91a2b568 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:21:28 +0100
+Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
+
+This commit adds some logic to the Python build system to be able to
+disable Python extensions. Follow-up commits actually add options to
+disable specific extensions.
+
+Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 2 ++
+ setup.py | 5 ++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 96fc718..33b994d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -156,6 +156,8 @@
+@@ -161,6 +161,8 @@ FILEMODE= 644
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -11,7 +27,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -477,6 +479,7 @@
+@@ -548,6 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -19,7 +35,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1191,7 +1194,8 @@
+@@ -1269,7 +1272,8 @@ libainstall: all python-config
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -29,24 +45,24 @@ Index: b/Makefile.pre.in
--prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 63e6918..5d4232f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2284,6 +2284,8 @@
+@@ -2462,6 +2462,8 @@ LIBS="$withval $LIBS"
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ PKG_PROG_PKG_CONFIG
+AC_SUBST(DISABLED_EXTENSIONS)
+
# Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat,
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 64001e2..3b51c0a 100644
--- a/setup.py
+++ b/setup.py
-@@ -33,7 +33,10 @@
+@@ -33,7 +33,10 @@ host_platform = get_platform()
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
@@ -58,3 +74,6 @@ Index: b/setup.py
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
+--
+2.7.4
+
diff --git a/buildroot/package/python/008-distutils-use-python-sysroot.patch b/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
similarity index 75%
rename from buildroot/package/python/008-distutils-use-python-sysroot.patch
rename to buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
index 7cd74876..c68f1bf7 100644
--- a/buildroot/package/python/008-distutils-use-python-sysroot.patch
+++ b/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
@@ -1,4 +1,7 @@
-Adjust library/header paths for cross-compilation
+From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:22:19 +0100
+Subject: [PATCH] Adjust library/header paths for cross-compilation
When cross-compiling third-party extensions, the get_python_inc() or
get_python_lib() can be called, to return the path to headers or
@@ -15,12 +18,32 @@ The _python_sysroot variable is also used to prefix the LIBDIR value
taken from the sysconfigdata module.
Signed-off-by: Thomas Petazzoni
+---
+ Lib/distutils/command/build_ext.py | 5 ++++-
+ Lib/distutils/sysconfig.py | 9 +++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
+diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+index 2c68be3..375b08c 100644
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -240,7 +240,10 @@ class build_ext (Command):
+ if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
+ if not sysconfig.python_build:
+ # building third party extensions
+- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
++ libdir = sysconfig.get_config_var('LIBDIR')
++ if "_python_sysroot" in os.environ:
++ libdir = os.environ.get("_python_sysroot") + libdir
++ self.library_dirs.append(libdir)
+ else:
+ # building python standard extensions
+ self.library_dirs.append('.')
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index d72b6e5..72151df 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -19,8 +19,13 @@
+@@ -19,8 +19,13 @@ import sys
from distutils.errors import DistutilsPlatformError
# These are needed in a couple of spots, so just compute them once.
@@ -36,19 +59,6 @@ Index: b/Lib/distutils/sysconfig.py
# Path to the base directory of the project. On Windows the binary may
# live in project/PCBuild9. If we're dealing with an x64 Windows build,
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -237,7 +237,10 @@
- if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
- if not sysconfig.python_build:
- # building third party extensions
-- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+ libdir = sysconfig.get_config_var('LIBDIR')
-+ if "_python_sysroot" in os.environ:
-+ libdir = os.environ.get("_python_sysroot") + libdir
-+ self.library_dirs.append(libdir)
- else:
- # building python standard extensions
- self.library_dirs.append('.')
+--
+2.7.4
+
diff --git a/buildroot/package/python/009-no-termcap-host-path.patch b/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
similarity index 67%
rename from buildroot/package/python/009-no-termcap-host-path.patch
rename to buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
index 781e1795..d523b746 100644
--- a/buildroot/package/python/009-no-termcap-host-path.patch
+++ b/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -1,13 +1,18 @@
-Don't look in /usr/lib/termcap for libraries
+From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:22:40 +0100
+Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
-
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 3b51c0a..fa32532 100644
--- a/setup.py
+++ b/setup.py
-@@ -764,12 +764,9 @@
+@@ -784,12 +784,9 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
@@ -21,3 +26,6 @@ Index: b/setup.py
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
+--
+2.7.4
+
diff --git a/buildroot/package/python/010-fix-python-config.patch b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
similarity index 77%
rename from buildroot/package/python/010-fix-python-config.patch
rename to buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
index 2beb2333..761d6d92 100644
--- a/buildroot/package/python/010-fix-python-config.patch
+++ b/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
@@ -1,55 +1,31 @@
+From e5b0d225f4343e82791cb80e4e0c01a9b49eeff4 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias
+Date: Tue, 7 Mar 2017 22:23:14 +0100
+Subject: [PATCH] Fix python-config for cross-builds
+
Add a backport of http://bugs.python.org/issue16235 so we can use
python-config for cross builds.
-This basically replaces the python version of python-config with a pure-shell
-version that's already preprocessed when installed and doesn't depend
-on the sysconfig import that usually leads to bad data/results.
+
+This basically replaces the python version of python-config with a
+pure-shell version that's already preprocessed when installed and
+doesn't depend on the sysconfig import that usually leads to bad
+data/results.
Signed-off-by: Gustavo Zacarias
+[Bernd: rebased for Python 2.7.15]
+Signed-off-by: Bernd Kuhls
+---
+ Makefile.pre.in | 13 +++---
+ Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 7 +++-
+ 3 files changed, 116 insertions(+), 6 deletions(-)
+ create mode 100644 Misc/python-config.sh.in
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -882,6 +882,7 @@
-
- # Other platforms follow
- if test $enable_shared = "yes"; then
-+ PY_ENABLE_SHARED=1
- AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
- case $ac_sys_system in
- BeOS*)
-@@ -942,6 +943,7 @@
-
- esac
- else # shared is disabled
-+ PY_ENABLE_SHARED=0
- case $ac_sys_system in
- CYGWIN*)
- BLDLIBRARY='$(LIBRARY)'
-@@ -1918,6 +1920,9 @@
- AC_SUBST(BLDSHARED)
- AC_SUBST(CCSHARED)
- AC_SUBST(LINKFORSHARED)
-+AC_SUBST(PY_ENABLE_SHARED)
-+LIBPL="${prefix}/lib/python${VERSION}/config"
-+AC_SUBST(LIBPL)
- # SO is the extension of shared libraries `(including the dot!)
- # -- usually .so, .sl on HP-UX, .dll on Cygwin
- AC_MSG_CHECKING(SO)
-@@ -4581,7 +4586,7 @@
- AC_SUBST(ENSUREPIP)
-
- # generate output files
--AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
-+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
- AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
- AC_OUTPUT
-
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 33b994d..beb0837 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -166,7 +166,7 @@
+@@ -171,7 +171,7 @@ SRCDIRS= @SRCDIRS@
SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed
@@ -58,16 +34,16 @@ Index: b/Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS)
-@@ -410,7 +410,7 @@
+@@ -431,7 +431,7 @@ LIBRARY_OBJS= \
# Default target
- all: build_all
--build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
-+build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
+ all: @DEF_MAKE_ALL_RULE@
+-build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
- # Compile a binary with gcc profile guided optimization.
+ # Compile a binary with profile guided optimization.
profile-opt:
-@@ -1101,10 +1101,12 @@
+@@ -1179,10 +1179,12 @@ $(srcdir)/Lib/$(PLATDIR):
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -82,7 +58,7 @@ Index: b/Makefile.pre.in
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1163,7 +1165,7 @@
+@@ -1241,7 +1243,7 @@ libainstall: all python-config
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -91,7 +67,7 @@ Index: b/Makefile.pre.in
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1345,6 +1347,7 @@
+@@ -1426,6 +1428,7 @@ clobber: clean profile-removal
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -99,8 +75,9 @@ Index: b/Makefile.pre.in
# Make things extra clean, before making a distribution:
# remove all generated files, even Makefile[.pre]
-Index: b/Misc/python-config.sh.in
-===================================================================
+diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
+new file mode 100644
+index 0000000..10db4c1
--- /dev/null
+++ b/Misc/python-config.sh.in
@@ -0,0 +1,102 @@
@@ -206,3 +183,45 @@ Index: b/Misc/python-config.sh.in
+ ;;
+esac
+done
+diff --git a/configure.ac b/configure.ac
+index 5d4232f..183a903 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -905,6 +905,7 @@ fi
+
+ # Other platforms follow
+ if test $enable_shared = "yes"; then
++ PY_ENABLE_SHARED=1
+ AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
+ case $ac_sys_system in
+ BeOS*)
+@@ -965,6 +966,7 @@ if test $enable_shared = "yes"; then
+
+ esac
+ else # shared is disabled
++ PY_ENABLE_SHARED=0
+ case $ac_sys_system in
+ CYGWIN*)
+ BLDLIBRARY='$(LIBRARY)'
+@@ -2096,6 +2098,9 @@ AC_SUBST(LDCXXSHARED)
+ AC_SUBST(BLDSHARED)
+ AC_SUBST(CCSHARED)
+ AC_SUBST(LINKFORSHARED)
++AC_SUBST(PY_ENABLE_SHARED)
++LIBPL="${prefix}/lib/python${VERSION}/config"
++AC_SUBST(LIBPL)
+ # SO is the extension of shared libraries `(including the dot!)
+ # -- usually .so, .sl on HP-UX, .dll on Cygwin
+ AC_MSG_CHECKING(SO)
+@@ -4818,7 +4823,7 @@ AC_MSG_RESULT($ENSUREPIP)
+ AC_SUBST(ENSUREPIP)
+
+ # generate output files
+-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+ AC_OUTPUT
+
+--
+2.7.4
+
diff --git a/buildroot/package/python/011-remove-python-symlink.patch b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
similarity index 55%
rename from buildroot/package/python/011-remove-python-symlink.patch
rename to buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
index b0548c31..864ccbfb 100644
--- a/buildroot/package/python/011-remove-python-symlink.patch
+++ b/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
@@ -1,19 +1,27 @@
-Remove the python symlink install rules.
+From bddfcbb8a4c011ca2fe471f7a4124cd64b5b0f00 Mon Sep 17 00:00:00 2001
+From: Samuel Martin
+Date: Tue, 7 Mar 2017 22:23:58 +0100
+Subject: [PATCH] Remove the python symlink install rules
-The python symlink installation will be handled by Buildroot itself, because
-Buildroot needs to control to what python interpreter (python2 or python3) the
-python symlink points to.
+The python symlink installation will be handled by Buildroot itself,
+because Buildroot needs to control to what python interpreter (python2
+or python3) the python symlink points to.
Signed-off-by: Samuel Martin
+[Bernd: rebased against version 2.7.12.]
+Signed-off-by: Bernd Kuhls
+---
+ Makefile.pre.in | 7 -------
+ 1 file changed, 7 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index beb0837..dedcf61 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -890,17 +890,10 @@
- # $(PYTHON) -> python2 -> python$(VERSION))
- # Also create equivalent chains for other installed files
- bininstall: altbininstall
+@@ -968,17 +968,10 @@ bininstall: altbininstall
+ echo "Creating directory $(LIBPC)"; \
+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
+ fi
- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
@@ -28,3 +36,6 @@ Index: b/Makefile.pre.in
-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
-rm -f $(DESTDIR)$(LIBPC)/python2.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
+--
+2.7.4
+
diff --git a/buildroot/package/python/013-dont-add-multiarch-path.patch b/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
similarity index 68%
rename from buildroot/package/python/013-dont-add-multiarch-path.patch
rename to buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
index 24e7af9f..b84c9077 100644
--- a/buildroot/package/python/013-dont-add-multiarch-path.patch
+++ b/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
@@ -1,4 +1,7 @@
-Don't add multiarch paths
+From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:24:28 +0100
+Subject: [PATCH] Don't add multiarch paths
The add_multiarch_paths() function leads, in certain build
environments, to the addition of host header paths to the CFLAGS,
@@ -9,12 +12,15 @@ cross-compiling.
Investigation done by David .
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index fa32532..0b9ea57 100644
--- a/setup.py
+++ b/setup.py
-@@ -456,9 +456,9 @@
+@@ -461,9 +461,9 @@ class PyBuildExt(build_ext):
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
@@ -25,3 +31,6 @@ Index: b/setup.py
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
+--
+2.7.4
+
diff --git a/buildroot/package/python/014-abort-on-failed-modules.patch b/buildroot/package/python/0012-Abort-on-failed-module-build.patch
similarity index 57%
rename from buildroot/package/python/014-abort-on-failed-modules.patch
rename to buildroot/package/python/0012-Abort-on-failed-module-build.patch
index 4bceeb62..7d952ca5 100644
--- a/buildroot/package/python/014-abort-on-failed-modules.patch
+++ b/buildroot/package/python/0012-Abort-on-failed-module-build.patch
@@ -1,4 +1,7 @@
-Abort on failed module build
+From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:24:48 +0100
+Subject: [PATCH] Abort on failed module build
When building a Python module fails, the setup.py script currently
doesn't exit with an error, and simply continues. This is not a really
@@ -6,12 +9,15 @@ nice behavior, so this patch changes setup.py to abort with an error,
so that the build issue is clearly noticeable.
Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 0b9ea57..9a5c2b8 100644
--- a/setup.py
+++ b/setup.py
-@@ -283,6 +283,7 @@
+@@ -299,6 +299,7 @@ class PyBuildExt(build_ext):
print "Failed to build these modules:"
print_three_column(failed)
print
@@ -19,3 +25,6 @@ Index: b/setup.py
def build_extension(self, ext):
+--
+2.7.4
+
diff --git a/buildroot/package/python/015-fix-sqlite-without-threads.patch b/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
similarity index 72%
rename from buildroot/package/python/015-fix-sqlite-without-threads.patch
rename to buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
index f51c37b3..dfc11efc 100644
--- a/buildroot/package/python/015-fix-sqlite-without-threads.patch
+++ b/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
@@ -1,4 +1,7 @@
-sqlite3: fix build when threads are not used/available
+From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN"
+Date: Tue, 7 Mar 2017 22:25:14 +0100
+Subject: [PATCH] sqlite3: fix build when threads are not used/available
When threads are not used/available, a function in the sqlite3 extension
ends up with a label at the end:
@@ -34,12 +37,15 @@ Fix that by adding a dummy statement after the label, so that the label
is never the last statement of the function.
Signed-off-by: "Yann E. MORIN"
+---
+ Modules/_sqlite/connection.c | 1 +
+ 1 file changed, 1 insertion(+)
-Index: b/Modules/_sqlite/connection.c
-===================================================================
+diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
+index 237d6e4..cdf69ab 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
-@@ -786,6 +786,7 @@
+@@ -794,6 +794,7 @@ error:
#ifdef WITH_THREAD
PyGILState_Release(threadstate);
#endif
@@ -47,3 +53,6 @@ Index: b/Modules/_sqlite/connection.c
}
static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
+--
+2.7.4
+
diff --git a/buildroot/package/python/016-serial-ioctl-workaround.patch b/buildroot/package/python/0014-Serial-ioctl-workaround.patch
similarity index 66%
rename from buildroot/package/python/016-serial-ioctl-workaround.patch
rename to buildroot/package/python/0014-Serial-ioctl-workaround.patch
index 80ed65e3..468d535a 100644
--- a/buildroot/package/python/016-serial-ioctl-workaround.patch
+++ b/buildroot/package/python/0014-Serial-ioctl-workaround.patch
@@ -1,4 +1,7 @@
-Serial ioctl() workaround
+From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001
+From: Baruch Siach
+Date: Tue, 7 Mar 2017 22:25:36 +0100
+Subject: [PATCH] Serial ioctl() workaround
The ioctls.h of some architectures (notably xtensa) references structs from
linux/serial.h. Make sure to include this header as well.
@@ -8,8 +11,11 @@ but isn't actually referenced in modern kernels.
Signed-off-by: Baruch Siach
---
-Index: b/Modules/termios.c
-===================================================================
+ Modules/termios.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Modules/termios.c b/Modules/termios.c
+index 57f30dc..a8c9855 100644
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -16,7 +16,9 @@
@@ -22,3 +28,6 @@ Index: b/Modules/termios.c
/* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
* MDTR, MRI, and MRTS (appearantly used internally by some things
+--
+2.7.4
+
diff --git a/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch b/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
similarity index 61%
rename from buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
rename to buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
index da4dc36d..fecf29f4 100644
--- a/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
+++ b/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
@@ -1,4 +1,8 @@
-Do not adjust the shebang of Python scripts for cross-compilation
+From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier
+Date: Tue, 7 Mar 2017 22:26:09 +0100
+Subject: [PATCH] Do not adjust the shebang of Python scripts for
+ cross-compilation
The copy_scripts() method in distutils copies the scripts listed in
the setup file and adjusts the first line to refer to the current
@@ -9,12 +13,15 @@ This patch modifies copy_scripts() to preserve the shebang when
cross-compilation is detected.
Signed-off-by: Christophe Vu-Brugier
+---
+ Lib/distutils/command/build_scripts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/Lib/distutils/command/build_scripts.py
-===================================================================
+diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
+index 567df65..4922d50 100644
--- a/Lib/distutils/command/build_scripts.py
+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ class build_scripts (Command):
adjust = 1
post_interp = match.group(1) or ''
@@ -23,3 +30,6 @@ Index: b/Lib/distutils/command/build_scripts.py
log.info("copying and adjusting %s -> %s", script,
self.build_dir)
if not self.dry_run:
+--
+2.7.4
+
diff --git a/buildroot/package/python/100-optional-test-modules.patch b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
similarity index 77%
rename from buildroot/package/python/100-optional-test-modules.patch
rename to buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
index 1180b290..2e1a054f 100644
--- a/buildroot/package/python/100-optional-test-modules.patch
+++ b/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
@@ -1,21 +1,25 @@
-Add an option to disable installation of test modules
+From 0eac7789c0dd4aebe9e69d3c73d0c95e96922ea3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:16 +0100
+Subject: [PATCH] Add an option to disable installation of test modules
The Python standard distribution comes with many test modules, that
are not necessarly useful on embedded targets.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
+[Bernd: rebased against version 2.7.14]
+Signed-off-by: Bernd Kuhls
---
- Makefile.pre.in | 40 +++++++++++++++++++++++++++-------------
- configure.in | 6 ++++++
- 2 files changed, 33 insertions(+), 13 deletions(-)
+ Makefile.pre.in | 48 ++++++++++++++++++++++++++++++++----------------
+ configure.ac | 6 ++++++
+ 2 files changed, 38 insertions(+), 16 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index dedcf61..280cc4e 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -960,27 +960,43 @@
+@@ -1032,28 +1032,44 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -24,6 +28,7 @@ Index: b/Makefile.pre.in
- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
- test/imghdrdata \
- test/subprocessdata \
+- test/support \
- test/tracedmodules \
+LIBSUBDIRS= lib-tk site-packages \
encodings compiler hotshot \
@@ -56,6 +61,7 @@ Index: b/Makefile.pre.in
+ test/cjkencodings test/decimaltestdata test/xmltestdata \
+ test/imghdrdata \
+ test/subprocessdata \
++ test/support \
+ test/tracedmodules \
+ email/test email/test/data \
+ json/tests \
@@ -75,11 +81,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 183a903..a1a35f6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2628,6 +2628,12 @@
+@@ -2806,6 +2806,12 @@ if test "$posix_threads" = "yes"; then
fi
@@ -92,3 +98,6 @@ Index: b/configure.ac
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
+--
+2.7.4
+
diff --git a/buildroot/package/python/101-optional-pydoc.patch b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
similarity index 70%
rename from buildroot/package/python/101-optional-pydoc.patch
rename to buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
index d5dc3d72..18582f18 100644
--- a/buildroot/package/python/101-optional-pydoc.patch
+++ b/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
@@ -1,22 +1,24 @@
-Add an option to disable pydoc
+From 52463745b6c46a46a6f2e2bc17983bb3f7bdac6e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:34 +0100
+Subject: [PATCH] Add an option to disable pydoc
It removes 0.5 MB of data from the target plus the pydoc script
itself.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 5 +++++
- setup.py | 10 +++++++---
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 5 +++++
+ setup.py | 10 +++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 280cc4e..84d5fc6 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -974,7 +974,7 @@
+@@ -1052,7 +1052,7 @@ LIBSUBDIRS= lib-tk site-packages \
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -25,7 +27,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -997,6 +997,10 @@
+@@ -1075,6 +1075,10 @@ ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@@ -36,11 +38,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index a1a35f6..8bab160 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2627,6 +2627,11 @@
+@@ -2805,6 +2805,11 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -52,11 +54,11 @@ Index: b/configure.ac
AC_SUBST(TEST_MODULES)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 9a5c2b8..69771e2 100644
--- a/setup.py
+++ b/setup.py
-@@ -2222,6 +2222,12 @@
+@@ -2233,6 +2233,12 @@ def main():
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +71,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2242,9 +2248,7 @@
+@@ -2253,9 +2259,7 @@ def main():
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
@@ -80,3 +82,6 @@ Index: b/setup.py
)
# --install-platlib
+--
+2.7.4
+
diff --git a/buildroot/package/python/102-optional-2to3.patch b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
similarity index 71%
rename from buildroot/package/python/102-optional-2to3.patch
rename to buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
index 76edfa10..765b05d9 100644
--- a/buildroot/package/python/102-optional-2to3.patch
+++ b/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
@@ -1,22 +1,24 @@
-Add an option to disable lib2to3
+From d0cf9ebed6d34d820cf594578cf513797fb52772 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:27:49 +0100
+Subject: [PATCH] Add an option to disable lib2to3
lib2to3 is a library to convert Python 2.x code to Python 3.x. As
such, it is probably not very useful on embedded system targets.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 24 +++++++++++++++++-------
- configure.in | 6 ++++++
- setup.py | 5 +++--
- 3 files changed, 26 insertions(+), 9 deletions(-)
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac | 6 ++++++
+ setup.py | 5 +++--
+ 3 files changed, 17 insertions(+), 5 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 84d5fc6..b2a0490 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS= lib-tk site-packages \
json \
sqlite3 \
logging bsddb csv importlib wsgiref \
@@ -24,7 +26,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -986,8 +985,6 @@
+@@ -1064,8 +1063,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
json/tests \
sqlite3/test \
bsddb/test \
@@ -33,7 +35,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1001,6 +998,14 @@
+@@ -1079,6 +1076,14 @@ ifeq (@PYDOC@,yes)
LIBSUBDIRS += pydoc_data
endif
@@ -48,11 +50,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 8bab160..270f337 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2639,6 +2639,12 @@
+@@ -2817,6 +2817,12 @@ AC_ARG_ENABLE(test-modules,
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -65,11 +67,11 @@ Index: b/configure.ac
# Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified])
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index 69771e2..f51ef8c 100644
--- a/setup.py
+++ b/setup.py
-@@ -2223,10 +2223,11 @@
+@@ -2234,10 +2234,11 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -83,3 +85,6 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
+--
+2.7.4
+
diff --git a/buildroot/package/python/103-optional-sqlite.patch b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
similarity index 59%
rename from buildroot/package/python/103-optional-sqlite.patch
rename to buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
index eb43c7a0..bffe3faa 100644
--- a/buildroot/package/python/103-optional-sqlite.patch
+++ b/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
@@ -1,18 +1,52 @@
-Add option to disable the sqlite3 module
+From 570e1e81484d9bcbd30a7719b07d02785a5cab24 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:28:06 +0100
+Subject: [PATCH] Add option to disable the sqlite3 module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 24 +++++++++++++++++-------
- configure.in | 9 +++++++++
- 2 file changed, 9 insertions(+)
+ Makefile.pre.in | 7 +++++--
+ configure.ac | 9 +++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
-Index: b/configure.ac
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index b2a0490..974a052 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1043,7 +1043,6 @@ LIBSUBDIRS= lib-tk site-packages \
+ email email/mime \
+ ensurepip ensurepip/_bundled \
+ json \
+- sqlite3 \
+ logging bsddb csv importlib wsgiref \
+ ctypes ctypes/macholib \
+ idlelib idlelib/Icons \
+@@ -1061,7 +1060,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+ test/tracedmodules \
+ email/test email/test/data \
+ json/tests \
+- sqlite3/test \
+ bsddb/test \
+ ctypes/test \
+ idlelib/idle_test \
+@@ -1084,6 +1082,11 @@ TESTSUBDIRS += lib2to3/tests \
+ lib2to3/tests/data/fixers/myfixes
+ endif
+
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++TESTSUBDIRS += sqlite3/test
++endif
++
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
+ do \
+diff --git a/configure.ac b/configure.ac
+index 270f337..e9e1897 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2627,6 +2627,15 @@
+@@ -2805,6 +2805,15 @@ if test "$posix_threads" = "yes"; then
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -28,35 +62,6 @@ Index: b/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -965,7 +965,6 @@
- email email/mime \
- ensurepip ensurepip/_bundled \
- json \
-- sqlite3 \
- logging bsddb csv importlib wsgiref \
- ctypes ctypes/macholib \
- idlelib idlelib/Icons \
-@@ -983,7 +982,6 @@
- test/tracedmodules \
- email/test email/test/data \
- json/tests \
-- sqlite3/test \
- bsddb/test \
- ctypes/test \
- idlelib/idle_test \
-@@ -1006,6 +1004,11 @@
- lib2to3/tests/data/fixers/myfixes
- endif
-
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+TESTSUBDIRS += sqlite3/test
-+endif
-+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
+--
+2.7.4
+
diff --git a/buildroot/package/python/104-optional-tk.patch b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
similarity index 65%
rename from buildroot/package/python/104-optional-tk.patch
rename to buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
index f402e420..82df405e 100644
--- a/buildroot/package/python/104-optional-tk.patch
+++ b/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
@@ -1,18 +1,20 @@
-Add an option to disable the tk module
+From 05fbe2527b6f87edeef11f288c36bcbaa378ca02 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:28:57 +0100
+Subject: [PATCH] Add an option to disable the tk module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 14 ++++++++++----
- configure.in | 9 +++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac | 9 +++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 974a052..f7f025f 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -960,7 +960,7 @@
+@@ -1038,7 +1038,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -21,7 +23,7 @@ Index: b/Makefile.pre.in
encodings compiler hotshot \
email email/mime \
ensurepip ensurepip/_bundled \
-@@ -974,8 +974,7 @@
+@@ -1052,8 +1052,7 @@ LIBSUBDIRS= lib-tk site-packages \
lib-old \
curses $(MACHDEPS)
@@ -31,7 +33,7 @@ Index: b/Makefile.pre.in
test/cjkencodings test/decimaltestdata test/xmltestdata \
test/imghdrdata \
test/subprocessdata \
-@@ -1009,6 +1008,12 @@
+@@ -1087,6 +1086,12 @@ LIBSUBDIRS += sqlite3
TESTSUBDIRS += sqlite3/test
endif
@@ -44,11 +46,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index e9e1897..d0f032c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2636,6 +2636,15 @@
+@@ -2814,6 +2814,15 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
@@ -64,3 +66,6 @@ Index: b/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+--
+2.7.4
+
diff --git a/buildroot/package/python/105-optional-curses.patch b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
similarity index 62%
rename from buildroot/package/python/105-optional-curses.patch
rename to buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
index a73fb04e..c36942ad 100644
--- a/buildroot/package/python/105-optional-curses.patch
+++ b/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
@@ -1,18 +1,20 @@
-Add an option to disable the curses module
+From dba12f15baad06cc7e17a275201cc022bb6c84f7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:06 +0100
+Subject: [PATCH] Add an option to disable the curses module
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 9 +++++++++
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index f7f025f..bd537d9 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -972,7 +972,7 @@
+@@ -1050,7 +1050,7 @@ LIBSUBDIRS= site-packages \
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -21,7 +23,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1014,6 +1014,10 @@
+@@ -1092,6 +1092,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
lib-tk/test/test_ttk
endif
@@ -32,11 +34,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index d0f032c..ab081bc 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2645,6 +2645,15 @@
+@@ -2823,6 +2823,15 @@ if test "$TK" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
@@ -52,3 +54,6 @@ Index: b/configure.ac
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+--
+2.7.4
+
diff --git a/buildroot/package/python/106-optional-expat.patch b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
similarity index 75%
rename from buildroot/package/python/106-optional-expat.patch
rename to buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
index 1ee117ce..8253f112 100644
--- a/buildroot/package/python/106-optional-expat.patch
+++ b/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
@@ -1,4 +1,7 @@
-Add an option to disable expat
+From 5f0f30bf342cd2b13f98513c39fd8f17351b1a2f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:20 +0100
+Subject: [PATCH] Add an option to disable expat
This patch replaces the existing --with-system-expat option with a
--with-expat={system,builtin,none} option, which allows to tell Python
@@ -8,18 +11,17 @@ installation of XML modules).
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 6 +++++-
- configure.in | 18 +++++++++++++-----
- setup.py | 2 +-
+ Makefile.pre.in | 6 +++++-
+ configure.ac | 18 +++++++++++++-----
+ setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index bd537d9..e5d0dd7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -968,7 +968,7 @@
+@@ -1046,7 +1046,7 @@ LIBSUBDIRS= site-packages \
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +30,7 @@ Index: b/Makefile.pre.in
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
-@@ -1018,6 +1018,10 @@
+@@ -1096,6 +1096,10 @@ ifeq (@CURSES@,yes)
LIBSUBDIRS += curses
endif
@@ -39,11 +41,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index ab081bc..63ee545 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2292,13 +2292,21 @@
+@@ -2470,13 +2470,21 @@ PKG_PROG_PKG_CONFIG
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -70,11 +72,11 @@ Index: b/configure.ac
# Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi)
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index f51ef8c..c68f6b4 100644
--- a/setup.py
+++ b/setup.py
-@@ -1474,7 +1474,7 @@
+@@ -1483,7 +1483,7 @@ class PyBuildExt(build_ext):
#
# More information on Expat can be found at www.libexpat.org.
#
@@ -83,3 +85,6 @@ Index: b/setup.py
expat_inc = []
define_macros = []
expat_lib = ['expat']
+--
+2.7.4
+
diff --git a/buildroot/package/python/107-optional-codecs-cjk.patch b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
similarity index 58%
rename from buildroot/package/python/107-optional-codecs-cjk.patch
rename to buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
index 6329b0cc..e2c2d98b 100644
--- a/buildroot/package/python/107-optional-codecs-cjk.patch
+++ b/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
@@ -1,16 +1,18 @@
-Add an option to disable CJK codecs
+From cb848dae763a3f57e31d734d3be6889f660fa0d0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:31 +0100
+Subject: [PATCH] Add an option to disable CJK codecs
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 63ee545..6a854ab 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2644,6 +2644,12 @@
+@@ -2822,6 +2822,12 @@ if test "$SQLITE3" = "no" ; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
@@ -23,3 +25,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/108-optional-nis.patch b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
similarity index 63%
rename from buildroot/package/python/108-optional-nis.patch
rename to buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
index f07bbb61..877dfd96 100644
--- a/buildroot/package/python/108-optional-nis.patch
+++ b/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
@@ -1,19 +1,21 @@
-Add an option to disable NIS
+From 133776d396b8eaf0243484dc990a53576de9685f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:41 +0100
+Subject: [PATCH] Add an option to disable NIS
NIS is not necessarily available in uClibc, so we need an option to
not compile support for it.
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 6a854ab..4c2cbc1 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2650,6 +2650,12 @@
+@@ -2828,6 +2828,12 @@ AC_ARG_ENABLE(codecs-cjk,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
@@ -26,3 +28,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/109-optional-unicodedata.patch b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
similarity index 58%
rename from buildroot/package/python/109-optional-unicodedata.patch
rename to buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
index 10da1ea7..a1255e56 100644
--- a/buildroot/package/python/109-optional-unicodedata.patch
+++ b/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
@@ -1,16 +1,18 @@
-Add an option to disable unicodedata
+From aa78e3684c0e8f7a5e910e838f9eca2631262048 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:29:52 +0100
+Subject: [PATCH] Add an option to disable unicodedata
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 4c2cbc1..09cb3de 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
@@ -23,3 +25,6 @@ Index: b/configure.ac
AC_SUBST(TK)
AC_ARG_ENABLE(tk,
AS_HELP_STRING([--disable-tk], [disable tk]),
+--
+2.7.4
+
diff --git a/buildroot/package/python/110-optional-db.patch b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
similarity index 72%
rename from buildroot/package/python/110-optional-db.patch
rename to buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
index 4b54e24c..e3ccd449 100644
--- a/buildroot/package/python/110-optional-db.patch
+++ b/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
@@ -1,4 +1,7 @@
-Add an option to disable bsddb
+From cfad2bcae8f572a9422ce5a6adb4caa7c0e521ad Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:06 +0100
+Subject: [PATCH] Add an option to disable bsddb
bsddb has an external dependency on Berkeley DB. Since we want to be
able to build Python without it, this patch adds an option to disable
@@ -6,17 +9,16 @@ the build/installation of this Python module.
Signed-off-by: Thomas Petazzoni
Signed-off-by: Samuel Martin
-
---
- Makefile.pre.in | 10 ++++++++--
- configure.in | 22 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 2 deletions(-)
+ Makefile.pre.in | 8 ++++++--
+ configure.ac | 22 ++++++++++++++++++++++
+ 2 files changed, 28 insertions(+), 2 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e5d0dd7..2582574 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -965,7 +965,7 @@
+@@ -1043,7 +1043,7 @@ LIBSUBDIRS= site-packages \
email email/mime \
ensurepip ensurepip/_bundled \
json \
@@ -25,7 +27,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command \
-@@ -981,7 +981,6 @@
+@@ -1059,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -33,7 +35,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1022,6 +1021,11 @@
+@@ -1100,6 +1099,11 @@ ifeq (@EXPAT@,yes)
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -45,11 +47,11 @@ Index: b/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 09cb3de..524614c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,28 @@
+@@ -2834,6 +2834,28 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
@@ -78,3 +80,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(unicodedata,
AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/111-optional-ssl.patch b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
similarity index 50%
rename from buildroot/package/python/111-optional-ssl.patch
rename to buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
index 72891cd5..5f2fb87b 100644
--- a/buildroot/package/python/111-optional-ssl.patch
+++ b/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
@@ -1,25 +1,30 @@
-Add an option to disable the ssl module
+From fc16ab40e3e6a5b4deed2fa7c5475fa216ff8d17 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:22 +0100
+Subject: [PATCH] Add an option to disable the ssl module
Signed-off-by: Thomas Petazzoni
-
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 524614c..cadac82 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
+AC_ARG_ENABLE(ssl,
+ AS_HELP_STRING([--disable-ssl], [disable SSL]),
+ [ if test "$enableval" = "no"; then
-+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
+ fi])
+
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/112-optional-bzip2.patch b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
similarity index 58%
rename from buildroot/package/python/112-optional-bzip2.patch
rename to buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
index 3a646e17..da914b47 100644
--- a/buildroot/package/python/112-optional-bzip2.patch
+++ b/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
@@ -1,15 +1,18 @@
-Add an option to disable the bz2 module
+From 6b10788fa040442ace100c3a28cbfff29c9db471 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:33 +0100
+Subject: [PATCH] Add an option to disable the bz2 module
Signed-off-by: Thomas Petazzoni
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index 743707a..f1762e9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2662,6 +2662,12 @@
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
@@ -22,3 +25,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/113-optional-zlib.patch b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
similarity index 58%
rename from buildroot/package/python/113-optional-zlib.patch
rename to buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
index a4ca8bd4..b4354e27 100644
--- a/buildroot/package/python/113-optional-zlib.patch
+++ b/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
@@ -1,15 +1,18 @@
-Add an option to disable the zlib module
+From af2c56aa0a5900272cc2d04ce667d4b38e34b596 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:45 +0100
+Subject: [PATCH] Add an option to disable the zlib module
Signed-off-by: Thomas Petazzoni
---
- configure.in | 6 ++++++
+ configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index f1762e9..291ba35 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2668,6 +2668,12 @@
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(bz2,
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
@@ -22,3 +25,6 @@ Index: b/configure.ac
AC_ARG_ENABLE(dbm,
AS_HELP_STRING([--disable-dbm], [disable DBM]),
[ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/114-remove-idle-editor.patch b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
similarity index 63%
rename from buildroot/package/python/114-remove-idle-editor.patch
rename to buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
index 67b9050b..60e64c88 100644
--- a/buildroot/package/python/114-remove-idle-editor.patch
+++ b/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
@@ -1,4 +1,7 @@
-Do not install the idle editor
+From 4b7c45c756dccfd3b5ece36fe572042353d1c2f0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:30:56 +0100
+Subject: [PATCH] Do not install the idle editor
IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
highly unlikely to ever be useful in an embedded Linux system
@@ -7,12 +10,16 @@ idle and the related Python modules. It saves 800 KB-900 KB of
installed .pyc files.
Signed-off-by: Thomas Petazzoni
+---
+ Makefile.pre.in | 2 --
+ setup.py | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
-Index: b/Makefile.pre.in
-===================================================================
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 2582574..3cfc590 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS= site-packages \
json \
logging csv importlib wsgiref \
ctypes ctypes/macholib \
@@ -20,7 +27,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
multiprocessing multiprocessing/dummy \
unittest \
-@@ -982,7 +981,6 @@
+@@ -1060,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
email/test email/test/data \
json/tests \
ctypes/test \
@@ -28,11 +35,11 @@ Index: b/Makefile.pre.in
distutils/tests \
unittest/test
-Index: b/setup.py
-===================================================================
+diff --git a/setup.py b/setup.py
+index c68f6b4..8045a9b 100644
--- a/setup.py
+++ b/setup.py
-@@ -2223,7 +2223,7 @@
+@@ -2234,7 +2234,7 @@ def main():
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -41,3 +48,6 @@ Index: b/setup.py
if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
scripts += [ 'Tools/scripts/pydoc' ]
if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
+--
+2.7.4
+
diff --git a/buildroot/package/python/115-optional-ossaudiodev.patch b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
similarity index 70%
rename from buildroot/package/python/115-optional-ossaudiodev.patch
rename to buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
index de820368..c2aea5ed 100644
--- a/buildroot/package/python/115-optional-ossaudiodev.patch
+++ b/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -1,7 +1,7 @@
-From 30351d9b41a03c43d627d52d46e49ab91bfe342d Mon Sep 17 00:00:00 2001
+From 6af0f179d3db956146bbabac8748675e3abc1f78 Mon Sep 17 00:00:00 2001
From: Zoltan Gyarmati
-Date: Thu, 8 Jan 2015 11:41:40 +0100
-Subject: [PATCH 1/1] Add an option to disable the ossaudiodev module
+Date: Tue, 7 Mar 2017 22:31:22 +0100
+Subject: [PATCH] Add an option to disable the ossaudiodev module
Signed-off-by: Zoltan Gyarmati
---
@@ -9,10 +9,10 @@ Signed-off-by: Zoltan Gyarmati
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
-index e8cb52a..579e05b 100644
+index 291ba35..8dc573e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2717,6 +2717,12 @@ if test "$CURSES" = "no"; then
+@@ -2898,6 +2898,12 @@ if test "$CURSES" = "no"; then
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
fi
@@ -26,5 +26,5 @@ index e8cb52a..579e05b 100644
AC_ARG_ENABLE(pydoc,
--
-2.1.0
+2.7.4
diff --git a/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
new file mode 100644
index 00000000..bb3ccfa7
--- /dev/null
+++ b/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
@@ -0,0 +1,30 @@
+From f11dc326ae216911a67bd563b619f39522c14bf2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:33:02 +0100
+Subject: [PATCH] Add option to disable the hashlib module
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 8dc573e..854724d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+ fi])
+
++AC_ARG_ENABLE(hashlib,
++ AS_HELP_STRING([--disable-hashlib], [disable hashlib]),
++ [ if test "$enableval" = "no"; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
++ fi])
++
+ AC_ARG_ENABLE(bz2,
+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+ [ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
new file mode 100644
index 00000000..ade729fb
--- /dev/null
+++ b/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
@@ -0,0 +1,30 @@
+From 6b461f698bd33b3493207baf79f4ee02286be8e8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni
+Date: Tue, 7 Mar 2017 22:33:55 +0100
+Subject: [PATCH] Add an option to disable readline module
+
+Signed-off-by: Thomas Petazzoni
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 854724d..0a06497 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(hashlib,
+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
+ fi])
+
++AC_ARG_ENABLE(readline,
++ AS_HELP_STRING([--disable-readline], [disable readline]),
++ [ if test "$enableval" = "no"; then
++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
++ fi])
++
+ AC_ARG_ENABLE(bz2,
+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+ [ if test "$enableval" = "no"; then
+--
+2.7.4
+
diff --git a/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
new file mode 100644
index 00000000..8fe722bc
--- /dev/null
+++ b/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
@@ -0,0 +1,37 @@
+From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
+From: Samuel Cabrero
+Date: Sat, 1 Apr 2017 09:31:52 +0200
+Subject: [PATCH] Override system locale and set to default when adding gcc
+ paths
+
+Forces the use of the default locale in the function
+add_gcc_paths, which is called when cross compiling to add the
+include and library paths. This is necessary because otherwise
+the gcc output is localized and the output parsing fails, which
+results in no paths added and detect_modules not able to find
+any system library (eg. libz, libssl, etc.)
+
+[Thomas: patch taken from https://bugs.python.org/issue23767.]
+
+Signed-off-by: Samuel Cabrero
+Signed-off-by: Thomas Petazzoni
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8045a9b..c14f4ab 100644
+--- a/setup.py
++++ b/setup.py
+@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
+ tmpfile = os.path.join(self.build_temp, 'gccpaths')
+ if not os.path.exists(self.build_temp):
+ os.makedirs(self.build_temp)
+- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile))
++ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile))
+ is_gcc = False
+ in_incdirs = False
+ inc_dirs = []
+--
+2.7.4
+
diff --git a/buildroot/package/python/006-cross-compile-getaddrinfo.patch b/buildroot/package/python/006-cross-compile-getaddrinfo.patch
deleted file mode 100644
index ba6e6f0a..00000000
--- a/buildroot/package/python/006-cross-compile-getaddrinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -3346,7 +3346,7 @@
-
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
-
--if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- if test $ipv6 = yes
- then
diff --git a/buildroot/package/python/012-support-library-path-old-compilers.patch b/buildroot/package/python/012-support-library-path-old-compilers.patch
deleted file mode 100644
index 98038212..00000000
--- a/buildroot/package/python/012-support-library-path-old-compilers.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-python: do not rely only on LIBRARY_PATH for old compilers
-
-The cross-compilation improvements integrated in Python rely on the
-compiler exposing a line starting with LIBRARY_PATH when called with
--E -v. This is used by Python setup.py to find the installation
-locations of libraries.
-
-However, this LIBRARY_PATH line is not shown by very old compilers,
-such as the gcc 4.2.x compiler used on the AVR32 architecture. This
-causes libraries installed in the sysroot, such as libffi, to not be
-detected by the setup.py script.
-
-To fix this problem, this patch adds addtional logic to setup.py,
-which consists in deriving the library paths from the sysroot
-location, if no LIBRARY_PATH field was found.
-
-Signed-off-by: Thomas Petazzoni
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -418,6 +418,7 @@
- in_incdirs = False
- inc_dirs = []
- lib_dirs = []
-+ compiler_has_library_path = False
- try:
- if ret >> 8 == 0:
- with open(tmpfile) as fp:
-@@ -429,6 +430,7 @@
- elif line.startswith("End of search list"):
- in_incdirs = False
- elif is_gcc and line.startswith("LIBRARY_PATH"):
-+ compiler_has_library_path = True
- for d in line.strip().split("=")[1].split(":"):
- d = os.path.normpath(d)
- if '/gcc/' not in d:
-@@ -440,6 +442,15 @@
- finally:
- os.unlink(tmpfile)
-
-+ if not compiler_has_library_path:
-+ ret = os.system("%s -print-file-name=libc.a | sed -r -e 's:(usr/)?lib(32|64)?/([^/]*/)?libc\.a::' >%s" % (gcc, tmpfile))
-+ with open(tmpfile) as fp:
-+ line = fp.readline().strip()
-+ add_dir_to_list(self.compiler.library_dirs,
-+ os.path.join(line, "usr", "lib"))
-+ add_dir_to_list(self.compiler.library_dirs,
-+ os.path.join(line, "lib"))
-+
- def detect_modules(self):
- # Ensure that /usr/local is always used
- if not cross_compiling:
diff --git a/buildroot/package/python/Config.in b/buildroot/package/python/Config.in
index 87defad8..a7f16450 100644
--- a/buildroot/package/python/Config.in
+++ b/buildroot/package/python/Config.in
@@ -1,26 +1,28 @@
+comment "python needs a toolchain w/ wchar, threads, dynamic library"
+ depends on BR2_USE_MMU
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+
config BR2_PACKAGE_PYTHON
bool "python"
depends on BR2_USE_WCHAR
# uses fork()
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_THREADS # libffi
+ depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBFFI
help
The python language interpreter.
http://www.python.org/
-comment "python needs a toolchain w/ wchar, threads"
- depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
if BR2_PACKAGE_PYTHON
choice
prompt "python module format to install"
default BR2_PACKAGE_PYTHON_PYC_ONLY
help
- Select Python module format to install on target (py, pyc or both)
+ Select Python module format to install on target (py, pyc or
+ both)
config BR2_PACKAGE_PYTHON_PY_ONLY
bool ".py sources only"
@@ -38,14 +40,14 @@ menu "core python modules"
comment "The following modules are unusual or require extra libraries"
config BR2_PACKAGE_PYTHON_BZIP2
- select BR2_PACKAGE_BZIP2
bool "bzip2 module"
+ select BR2_PACKAGE_BZIP2
help
bzip2 module for Python
config BR2_PACKAGE_PYTHON_BSDDB
- select BR2_PACKAGE_BERKELEYDB
bool "bsddb module"
+ select BR2_PACKAGE_BERKELEYDB
help
bsddb module for Python.
@@ -55,8 +57,8 @@ config BR2_PACKAGE_PYTHON_CODECSCJK
Chinese/Japanese/Korean codecs module for Python (large).
config BR2_PACKAGE_PYTHON_CURSES
- select BR2_PACKAGE_NCURSES
bool "curses module"
+ select BR2_PACKAGE_NCURSES
help
curses module for Python.
@@ -65,22 +67,16 @@ config BR2_PACKAGE_PYTHON_OSSAUDIODEV
help
ossaudiodev module for Python.
-config BR2_PACKAGE_PYTHON_PYEXPAT
- select BR2_PACKAGE_EXPAT
- bool "pyexpat"
- help
- pyexpat module for Python.
-
config BR2_PACKAGE_PYTHON_READLINE
- select BR2_PACKAGE_READLINE
bool "readline"
+ select BR2_PACKAGE_READLINE
help
readline module for Python (required for command-line
editing in the Python shell).
config BR2_PACKAGE_PYTHON_SSL
- select BR2_PACKAGE_OPENSSL
bool "ssl"
+ select BR2_PACKAGE_OPENSSL
help
_ssl module for Python (required for https in urllib etc).
@@ -88,7 +84,8 @@ config BR2_PACKAGE_PYTHON_UNICODEDATA
bool "unicodedata module"
default y
help
- Unicode character database (used by stringprep module) (large).
+ Unicode character database (used by stringprep module)
+ (large).
if BR2_PACKAGE_PYTHON_UNICODEDATA
@@ -114,6 +111,12 @@ config BR2_PACKAGE_PYTHON_SQLITE
help
SQLite database support
+config BR2_PACKAGE_PYTHON_PYEXPAT
+ bool "xml module"
+ select BR2_PACKAGE_EXPAT
+ help
+ pyexpat and xml libraries for Python
+
config BR2_PACKAGE_PYTHON_ZLIB
bool "zlib module"
select BR2_PACKAGE_ZLIB
diff --git a/buildroot/package/python/python.hash b/buildroot/package/python/python.hash
new file mode 100644
index 00000000..feadcfdc
--- /dev/null
+++ b/buildroot/package/python/python.hash
@@ -0,0 +1,5 @@
+# From https://www.python.org/downloads/release/python-2715/
+md5 a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz
+# Locally calculated
+sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 Python-2.7.15.tar.xz
+sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 LICENSE
diff --git a/buildroot/package/python/python.mk b/buildroot/package/python/python.mk
index 4a3e71c8..42adaf77 100644
--- a/buildroot/package/python/python.mk
+++ b/buildroot/package/python/python.mk
@@ -5,10 +5,10 @@
################################################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).9
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).15
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE = Python software foundation license v2, others
+PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE = Python-2.0, others
PYTHON_LICENSE_FILES = LICENSE
PYTHON_LIBTOOL_PATCH = NO
@@ -17,30 +17,34 @@ PYTHON_LIBTOOL_PATCH = NO
# also installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON_CONF_OPTS += \
- --enable-static \
- --without-cxx-main \
- --disable-sqlite3 \
- --disable-tk \
- --with-expat=system \
- --disable-curses \
- --disable-codecs-cjk \
- --disable-nis \
- --enable-unicodedata \
- --disable-dbm \
- --disable-gdbm \
- --disable-bsddb \
- --disable-test-modules \
- --disable-bz2 \
- --disable-ssl \
- --disable-ossaudiodev \
+HOST_PYTHON_CONF_OPTS += \
+ --enable-static \
+ --without-cxx-main \
+ --disable-sqlite3 \
+ --disable-tk \
+ --with-expat=system \
+ --disable-curses \
+ --disable-codecs-cjk \
+ --disable-nis \
+ --enable-unicodedata \
+ --disable-dbm \
+ --disable-gdbm \
+ --disable-bsddb \
+ --disable-test-modules \
+ --disable-bz2 \
+ --disable-ssl \
+ --disable-ossaudiodev \
--disable-pyo-build
# Make sure that LD_LIBRARY_PATH overrides -rpath.
# This is needed because libpython may be installed at the same time that
# python is called.
+# Make python believe we don't have 'hg' and 'svn', so that it doesn't
+# try to communicate over the network during the build.
HOST_PYTHON_CONF_ENV += \
- LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
+ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \
+ ac_cv_prog_HAS_HG=/bin/false \
+ ac_cv_prog_SVNVERSION=/bin/false
# Building host python in parallel sometimes triggers a "Bus error"
# during the execution of "./python setup.py build" in the
@@ -50,7 +54,7 @@ HOST_PYTHON_CONF_ENV += \
# MAKE1 has shown to workaround the problem.
HOST_PYTHON_MAKE = $(MAKE1)
-PYTHON_DEPENDENCIES = host-python libffi
+PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES)
HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
@@ -58,6 +62,8 @@ PYTHON_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
PYTHON_DEPENDENCIES += readline
+else
+PYTHON_CONF_OPTS += --disable-readline
endif
ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
@@ -101,6 +107,9 @@ endif
# Default is UCS2 w/o a conf opt
ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
+# host-python must have the same UCS2/4 configuration as the target
+# python
+HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4
PYTHON_CONF_OPTS += --enable-unicode=ucs4
endif
@@ -118,6 +127,8 @@ endif
ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
PYTHON_DEPENDENCIES += openssl
+else
+PYTHON_CONF_OPTS += --disable-hashlib
endif
ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y)
@@ -126,24 +137,36 @@ else
PYTHON_CONF_OPTS += --disable-ossaudiodev
endif
+# Make python believe we don't have 'hg' and 'svn', so that it doesn't
+# try to communicate over the network during the build.
PYTHON_CONF_ENV += \
ac_cv_have_long_long_format=yes \
ac_cv_file__dev_ptmx=yes \
ac_cv_file__dev_ptc=yes \
- ac_cv_working_tzset=yes
+ ac_cv_working_tzset=yes \
+ ac_cv_prog_HAS_HG=/bin/false \
+ ac_cv_prog_SVNVERSION=/bin/false
+
+# GCC is always compliant with IEEE754
+ifeq ($(BR2_ENDIAN),"LITTLE")
+PYTHON_CONF_ENV += ac_cv_little_endian_double=yes
+else
+PYTHON_CONF_ENV += ac_cv_big_endian_double=yes
+endif
PYTHON_CONF_OPTS += \
- --without-cxx-main \
- --without-doc-strings \
- --with-system-ffi \
- --disable-pydoc \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
- --disable-tk \
- --disable-nis \
- --disable-dbm \
- --disable-pyo-build
+ --without-cxx-main \
+ --without-doc-strings \
+ --with-system-ffi \
+ --disable-pydoc \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
+ --disable-tk \
+ --disable-nis \
+ --disable-dbm \
+ --disable-pyo-build \
+ --disable-pyc-build
# This is needed to make sure the Python build process doesn't try to
# regenerate those files with the pgen program. Otherwise, it builds
@@ -204,29 +227,61 @@ PYTHON_AUTORECONF = YES
# for the target, otherwise the default python program may be missing.
ifneq ($(BR2_PACKAGE_PYTHON3),y)
define HOST_PYTHON_INSTALL_PYTHON_SYMLINK
- ln -sf python2 $(HOST_DIR)/usr/bin/python
- ln -sf python2-config $(HOST_DIR)/usr/bin/python-config
+ mkdir -p $(HOST_DIR)/bin
+ ln -sf python $(HOST_DIR)/bin/python
+ ln -sf python2-config $(HOST_DIR)/bin/python-config
endef
HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK
endif
# Provided to other packages
-PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/
+PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/
$(eval $(autotools-package))
$(eval $(host-autotools-package))
+ifeq ($(BR2_REPRODUCIBLE),y)
+define PYTHON_FIX_TIME
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
+ xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH)
+endef
+endif
+
+define PYTHON_CREATE_PYC_FILES
+ $(PYTHON_FIX_TIME)
+ PYTHONPATH="$(PYTHON_PATH)" \
+ cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \
+ $(TOPDIR)/support/scripts/pycompile.py \
+ $(if $(BR2_REPRODUCIBLE),--force) \
+ usr/lib/python$(PYTHON_VERSION_MAJOR)
+endef
+
+ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y)
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES
+endif
+
ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y)
-define PYTHON_FINALIZE_TARGET
- find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | xargs -0 rm -f
+define PYTHON_REMOVE_PY_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES
endif
+# Normally, *.pyc files should not have been compiled, but just in
+# case, we make sure we remove all of them.
ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y)
-define PYTHON_FINALIZE_TARGET
- find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | xargs -0 rm -f
+define PYTHON_REMOVE_PYC_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES
endif
-TARGET_FINALIZE_HOOKS += PYTHON_FINALIZE_TARGET
+# In all cases, we don't want to keep the optimized .pyo files
+define PYTHON_REMOVE_PYO_FILES
+ find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \
+ xargs -0 --no-run-if-empty rm -f
+endef
+PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES
diff --git a/buildroot/package/rebootp/rebootp.mk b/buildroot/package/rebootp/rebootp.mk
index 5cfd647a..9867f52a 100644
--- a/buildroot/package/rebootp/rebootp.mk
+++ b/buildroot/package/rebootp/rebootp.mk
@@ -15,7 +15,7 @@ REBOOTP_INSTALL_STAGING = NO
define REBOOTP_BUILD_CMDS
cd $(@D)
$(MAKE) -C $(@D) all
- $(TARGET_STRIP) $(@D)/rebootp
+# $(TARGET_STRIP) $(@D)/rebootp
endef
define REBOOTP_INSTALL_TARGET_CMDS
diff --git a/buildroot/package/recovery/init b/buildroot/package/recovery/init
index 9a7b83dd..b533ccd5 100755
--- a/buildroot/package/recovery/init
+++ b/buildroot/package/recovery/init
@@ -123,6 +123,8 @@ fi
DEFAULT_STYLE=
DEFAULT_DRIVE=
DEFAULT_WALLPAPER_RESIZE=
+ GPIO_CHANNEL=
+ GPIO_CHANNEL_VALUE=
if grep -q runinstaller /proc/cmdline; then
RUN_INSTALLER=-runinstaller
@@ -173,6 +175,12 @@ fi
if [ -n "$pinndrive" ] ; then
DEFAULT_DRIVE="-pinndrive=$pinndrive"
fi
+ if [ "${p%%=*}" == "gpiochannel" ] ; then
+ GPIO_CHANNEL="-gpiochannel ${p#*=}"
+ fi
+ if [ "${p%%=*}" == "gpiochannelvalue" ] ; then
+ GPIO_CHANNEL_VALUE="-gpiochannelvalue ${p#*=}"
+ fi
done
if grep -q vncinstall /proc/cmdline; then
@@ -183,7 +191,7 @@ fi
echo
fi
- /usr/bin/recovery $RUN_INSTALLER $GPIO_TRIGGER $KEYBOARD_NO_TRIGGER $FORCE_TRIGGER $DEFAULT_KBD $DEFAULT_LANG $DEFAULT_DISPLAY $DEFAULT_PARTITION $DEFAULT_NOCONFIG $DEFAULT_DSI $DEFAULT_REPOS $EXTRA_REPOS $REPO_LIST $DEFAULT_STYLE $DEFAULT_DRIVE $DEFAULT_WALLPAPER_RESIZE -qws 2>/tmp/debug
+ /usr/bin/recovery $RUN_INSTALLER $GPIO_TRIGGER $KEYBOARD_NO_TRIGGER $FORCE_TRIGGER $DEFAULT_KBD $DEFAULT_LANG $DEFAULT_DISPLAY $DEFAULT_PARTITION $DEFAULT_NOCONFIG $DEFAULT_DSI $DEFAULT_REPOS $EXTRA_REPOS $REPO_LIST $DEFAULT_STYLE $DEFAULT_DRIVE $DEFAULT_WALLPAPER_RESIZE $GPIO_CHANNEL $GPIO_CHANNEL_VALUE -qws 2>/tmp/debug
# Recovery should have rebooted
diff --git a/buildroot/package/squashfs/0001-include-sysmacros.patch b/buildroot/package/squashfs/0001-include-sysmacros.patch
new file mode 100644
index 00000000..d794836c
--- /dev/null
+++ b/buildroot/package/squashfs/0001-include-sysmacros.patch
@@ -0,0 +1,47 @@
+From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire
+Date: Wed, 1 Aug 2018 12:17:10 +0200
+Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From glibc 2.25 release notes:
+https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+"* The inclusion of by is deprecated.
+ This means that in a future release, the macros “major”, “minor”, and
+ “makedev” will only be available from ."
+
+See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 .
+
+Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch
+Signed-off-by: Richard Kunze
+---
+ squashfs-tools/mksquashfs.c | 1 +
+ squashfs-tools/unsquashfs.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d696a51..8d57c3e 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -35,6 +35,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index a57f85c..a492b27 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -33,6 +33,7 @@
+ #include "fnmatch_compat.h"
+
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/buildroot/package/squashfs/Config.in b/buildroot/package/squashfs/Config.in
index 6dd65e30..c16ebbf2 100644
--- a/buildroot/package/squashfs/Config.in
+++ b/buildroot/package/squashfs/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_SQUASHFS
bool "squashfs"
- depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
@@ -42,8 +41,14 @@ config BR2_PACKAGE_SQUASHFS_XZ
help
Support XZ compression algorithm
+config BR2_PACKAGE_SQUASHFS_ZSTD
+ bool "zstd support"
+ select BR2_PACKAGE_ZSTD
+ help
+ Support ZSTD compression algorithm
+
endif
-comment "squashfs needs a toolchain w/ largefile, threads"
- depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+comment "squashfs needs a toolchain w/ threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
diff --git a/buildroot/package/squashfs/squashfs.hash b/buildroot/package/squashfs/squashfs.hash
index e308089b..4464e62c 100644
--- a/buildroot/package/squashfs/squashfs.hash
+++ b/buildroot/package/squashfs/squashfs.hash
@@ -1,2 +1,5 @@
-# Locally computed:
-sha256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 squashfs4.3.tar.gz
+# Locally computed
+sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
+
+# License files
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/buildroot/package/squashfs/squashfs.mk b/buildroot/package/squashfs/squashfs.mk
index 8ca9e2e5..80955a5f 100644
--- a/buildroot/package/squashfs/squashfs.mk
+++ b/buildroot/package/squashfs/squashfs.mk
@@ -4,14 +4,12 @@
#
################################################################################
-SQUASHFS_VERSION = 4.3
-SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
-SQUASHFS_LICENSE = GPLv2+
+SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
+SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
+SQUASHFS_SITE_METHOD = git
+SQUASHFS_LICENSE = GPL-2.0+
SQUASHFS_LICENSE_FILES = COPYING
-
-# no libattr in BR
-SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
SQUASHFS_DEPENDENCIES += lz4
@@ -41,6 +39,13 @@ else
SQUASHFS_MAKE_ARGS += LZO_SUPPORT=0
endif
+ifeq ($(BR2_PACKAGE_SQUASHFS_ZSTD),y)
+SQUASHFS_DEPENDENCIES += zstd
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=1 COMP_DEFAULT=zstd
+else
+SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=0
+endif
+
ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP),y)
SQUASHFS_DEPENDENCIES += zlib
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=1 COMP_DEFAULT=gzip
@@ -48,21 +53,21 @@ else
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
endif
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
+HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd
-# no libattr/xz in BR
HOST_SQUASHFS_MAKE_ARGS = \
- XATTR_SUPPORT=0 \
- XZ_SUPPORT=1 \
- GZIP_SUPPORT=1 \
- LZ4_SUPPORT=1 \
- LZO_SUPPORT=1 \
- LZMA_XZ_SUPPORT=1
+ XATTR_SUPPORT=1 \
+ XZ_SUPPORT=1 \
+ GZIP_SUPPORT=1 \
+ LZ4_SUPPORT=1 \
+ LZO_SUPPORT=1 \
+ LZMA_XZ_SUPPORT=1 \
+ ZSTD_SUPPORT=1
define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_MAKE_ENV) $(MAKE) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
$(SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
@@ -76,7 +81,7 @@ endef
define HOST_SQUASHFS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) \
CC="$(HOSTCC)" \
- EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
diff --git a/buildroot/package/zstd/Config.in b/buildroot/package/zstd/Config.in
new file mode 100644
index 00000000..9fa70c65
--- /dev/null
+++ b/buildroot/package/zstd/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_ZSTD
+ bool "zstd"
+ help
+ Zstandard, or zstd as short version, is a fast lossless
+ compression algorithm, targeting real-time compression
+ scenarios at zlib-level and better compression ratios
+
+ The selection of other packages will enable some features:
+ xz, lz4 and/or zlib will enable support for corresponding
+ compression formats
+
+ https://facebook.github.io/zstd
diff --git a/buildroot/package/zstd/Config.in.host b/buildroot/package/zstd/Config.in.host
new file mode 100644
index 00000000..05751f8f
--- /dev/null
+++ b/buildroot/package/zstd/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_ZSTD
+ bool "host zstd"
+ help
+ Zstandard, or zstd as short version, is a fast lossless
+ compression algorithm, targeting real-time compression
+ scenarios at zlib-level and better compression ratios
+
+ https://facebook.github.io/zstd
diff --git a/buildroot/package/zstd/zstd.hash b/buildroot/package/zstd/zstd.hash
new file mode 100644
index 00000000..95b22709
--- /dev/null
+++ b/buildroot/package/zstd/zstd.hash
@@ -0,0 +1,6 @@
+# Locally computed
+sha256 d6e1559e4cdb7c4226767d4ddc990bff5f9aab77085ff0d0490c828b025e2eea zstd-v1.3.5.tar.gz
+
+# License files (locally computed as well)
+sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE
+sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
diff --git a/buildroot/package/zstd/zstd.mk b/buildroot/package/zstd/zstd.mk
new file mode 100644
index 00000000..a1a11f9a
--- /dev/null
+++ b/buildroot/package/zstd/zstd.mk
@@ -0,0 +1,87 @@
+################################################################################
+#
+# zstd
+#
+################################################################################
+
+ZSTD_VERSION = v1.3.5
+ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION))
+ZSTD_INSTALL_STAGING = YES
+ZSTD_LICENSE = BSD-3-Clause or GPL-2.0
+ZSTD_LICENSE_FILES = LICENSE COPYING
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+ZSTD_OPTS += HAVE_THREAD=1
+else
+ZSTD_OPTS += HAVE_THREAD=0
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ZSTD_DEPENDENCIES += zlib
+ZSTD_OPTS += HAVE_ZLIB=1
+else
+ZSTD_OPTS += HAVE_ZLIB=0
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+ZSTD_DEPENDENCIES += xz
+ZSTD_OPTS += HAVE_LZMA=1
+else
+ZSTD_OPTS += HAVE_LZMA=0
+endif
+
+ifeq ($(BR2_PACKAGE_LZ4),y)
+ZSTD_DEPENDENCIES += lz4
+ZSTD_OPTS += HAVE_LZ4=1
+else
+ZSTD_OPTS += HAVE_LZ4=0
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+ZSTD_BUILD_LIBS = libzstd.a
+ZSTD_INSTALL_LIBS = install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+ZSTD_BUILD_LIBS = libzstd
+ZSTD_INSTALL_LIBS = install-shared
+else
+ZSTD_BUILD_LIBS = libzstd.a libzstd
+ZSTD_INSTALL_LIBS = install-static install-shared
+endif
+
+define ZSTD_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ -C $(@D)/lib $(ZSTD_BUILD_LIBS)
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ -C $(@D) zstd
+endef
+
+define ZSTD_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/lib \
+ install-pc install-includes $(ZSTD_INSTALL_LIBS)
+endef
+
+define ZSTD_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+ DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib $(ZSTD_INSTALL_LIBS)
+endef
+
+# note: no 'HAVE_...' options for host library build only
+define HOST_ZSTD_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ -C $(@D)/lib
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ -C $(@D) zstd
+endef
+
+define HOST_ZSTD_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \
+ DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/programs install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/changes.md b/changes.md
index a9668aa3..fd08a53d 100644
--- a/changes.md
+++ b/changes.md
@@ -516,3 +516,15 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
### V3.2.3
- **Customisations** - Fix bug introduced by backup preventing customisations.
+
+### V3.2.4a
+
+-**Build** - Modified to build on Ubuntu 18.10 'cosmic'
+-**Progress** - Experimental modification to measure installation progress more accurately
+-**Wifi dialog** - Removed focus for better use by keyboard
+-**Zipfles** - Use bsdtar to unzip inline for checksums
+-**Esc** - Esc key exits all menus
+-**Firmware** - Don't automatically downgrade firmware
+-**Options** - Added shortcuts for better keyboard use
+-**GPIO** - Allows gpiochannel and gpiochannelValue to be specified to trigger the recovery menu
+
diff --git a/history.md b/history.md
index ec76e2cc..df7e08ce 100644
--- a/history.md
+++ b/history.md
@@ -5,6 +5,17 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
## Change History
+### V3.2.4a
+
+-**Build** - Modified to build on Ubuntu 18.10 'cosmic'
+-**Progress** - Experimental modification to measure installation progress more accurately
+-**Wifi dialog** - Removed focus for better use by keyboard
+-**Zipfles** - Use bsdtar to unzip inline for checksums
+-**Esc** - Esc key exits all menus
+-**Firmware** - Don't automatically downgrade firmware
+-**Options** - Added shortcuts for better keyboard use
+-**GPIO** - Allows gpiochannel and gpiochannelValue to be specified to trigger the recovery menu
+
### V3.2.3
- **Customisations** - Fix bug introduced by backup preventing customisations.
diff --git a/osGroupMap.json b/osGroupMap.json
deleted file mode 100755
index 3a8afc8e..00000000
--- a/osGroupMap.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Raspbian with PIXEL" : "General",
- "Raspbian" : "General",
- "Raspbian Lite" : "General",
- "RISC OS" : "General",
- "Windows 10 IoT Core" : "General",
- "TLXOS " : "General",
- "Data Partition" : "General",
- "solydx" : "General",
- "ubuntuMate1604LTS" : "General",
- "kali1" : "General",
- "kali2" : "General",
- "rtandroid" : "General",
- "LibreELEC_RPi" : "Media",
- "LibreELEC_RPi2" : "Media",
- "OSMC_Pi1" : "Media",
- "OSMC_Pi2" : "Media",
- "openelec_rpi1" : "Media",
- "openelec_rpi2" : "Media",
- "XBian_RPi1" : "Media",
- "XBian_RPi3" : "Media",
- "RasPlex_RPi" : "Media",
- "RasPlex_RPi2" : "Media",
- "Retropie1" : "Games",
- "Retropie2" : "Games",
- "Lakka_RPi" : "Games",
- "Lakka_RPi2" : "Games",
- "recalboxOS-rpi1-master" : "Games",
- "recalboxOS-rpi2-master" : "Games",
- "recalboxOS-rpi3-master" : "Games",
- "batocera_RPi3" : "Games",
- "batocera_RPi2" : "Games",
- "batocera_RPi1" : "Games",
- "recalboxOS-rpi1" : "Games",
- "recalboxOS-rpi2" : "Games",
- "recalboxOS-rpi3" : "Games",
- "Kano_OS" : "Education",
- "AIYprojects" : "Education",
- "CStemBian" : "Education",
- "PiTop" : "Education",
- "lede2RPi1" : "Minimal",
- "lede2RPi2" : "Minimal",
- "lede2RPi3" : "Minimal",
- "Arch1" : "Minimal",
- "Arch2" : "Minimal",
- "void1" : "Minimal",
- "void1_musl" : "Minimal",
- "void2" : "Minimal",
- "void2_musl" : "Minimal"
-}
diff --git a/rebootp/Makefile b/rebootp/Makefile
index ce23eb04..ef93e0a4 100644
--- a/rebootp/Makefile
+++ b/rebootp/Makefile
@@ -1,5 +1,5 @@
#CC=/home/kevin/noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
-CC=$(PWD)/../noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
+#CC=$(PWD)/../noobs_test/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
all: rebootp
$(MAKE) $(AM_MAKEFLAGS) rebootp
diff --git a/recovery/backupthread.cpp b/recovery/backupthread.cpp
index 4b56110b..3fea57b9 100644
--- a/recovery/backupthread.cpp
+++ b/recovery/backupthread.cpp
@@ -5,6 +5,12 @@
#include "mbr.h"
#include "partitioninfo.h"
#include "osinfo.h"
+
+#define DBG_LOCAL 0
+#define LOCAL_DO_DBG 1
+#define LOCAL_DBG_FUNC 1
+#define LOCAL_DBG_OUT 1
+#define LOCAL_DBG_MSG 0
#include "mydebug.h"
#include
@@ -161,9 +167,10 @@ bool BackupThread::processImage(const QVariantMap & entry)
// Mount it
QProcess::execute("mount -o ro "+dev+" /tmp/src");
- emit newDrive(dev);
+ emit newDrive(dev, ePM_READSTATS);
QString cmd;
+ emit startAccounting();
if (fstype=="raw")
{
// dd/gzip image
@@ -184,8 +191,11 @@ bool BackupThread::processImage(const QVariantMap & entry)
{
qDebug() << tr("Error writing ")+entry.value("name").toString()+tr(": Disk full?");
delete pOsInfo;
+ emit stopAccounting();
return(false);
}
+ emit stopAccounting();
+ emit consolidate();
QString csumType = getCsumType(pmap);
if (csumType.isEmpty())
diff --git a/recovery/backupthread.h b/recovery/backupthread.h
index 1181bfba..5f86e2b8 100644
--- a/recovery/backupthread.h
+++ b/recovery/backupthread.h
@@ -1,6 +1,8 @@
#ifndef BackupThread_H
#define BackupThread_H
+#include "progressslideshowdialog.h"
+
#include
#include
#include
@@ -30,9 +32,10 @@ signals:
void statusUpdate(const QString &msg);
void parsedImagesize(qint64 size);
void completed(int errors);
- void runningMKFS();
- void finishedMKFS();
- void newDrive(const QString&);
+ void startAccounting();
+ void stopAccounting();
+ void consolidate();
+ void newDrive(const QString&, eProgressMode mode);
void newImage(const QString Imagefile);
public slots:
diff --git a/recovery/confeditdialog.ui b/recovery/confeditdialog.ui
index c212217b..8d514a7d 100644
--- a/recovery/confeditdialog.ui
+++ b/recovery/confeditdialog.ui
@@ -33,7 +33,7 @@
true
- Edit Options
+ &Edit Options
false
diff --git a/recovery/config.h b/recovery/config.h
index 95456f27..6717c09a 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 "3.2.3"
+#define VERSION_NUMBER "3.2.4a"
/* Color of the background */
// #define BACKGROUND_COLOR Qt::white
diff --git a/recovery/main.cpp b/recovery/main.cpp
index 1ae9ae8d..31fad9ce 100644
--- a/recovery/main.cpp
+++ b/recovery/main.cpp
@@ -191,6 +191,7 @@ int main(int argc, char *argv[])
qDebug() << "Board revision is " << rev;
int gpioChannel;
+ int gpioChannelValue = 0;
if (rev == 2 || rev == 3)
gpioChannel = 0;
@@ -214,6 +215,7 @@ int main(int argc, char *argv[])
bool noobsconfig = true;
bool use_default_source = true;
bool wallpaper_resize = false;
+ bool gpio_trigger = false;
QString defaultLang = "en";
QString defaultKeyboard = "gb";
@@ -230,7 +232,7 @@ int main(int argc, char *argv[])
wallpaper_resize = true;
// Enables use of GPIO 3 to force NOOBS to launch by pulling low
else if (strcmp(argv[i], "-gpiotriggerenable") == 0)
- gpio = new GpioInput(gpioChannel);
+ gpio_trigger=true;
// Disables use of keyboard to trigger recovery GUI
else if (strcmp(argv[i], "-keyboardtriggerdisable") == 0)
keyboard_trigger = false;
@@ -295,8 +297,24 @@ int main(int argc, char *argv[])
repoList = argv[i+1];
}
}
+ // Allow gpio channel to be specified in commandline
+ else if (strcmp(argv[i], "-gpiochannel") == 0)
+ {
+ if (argc > i+1)
+ gpioChannel = atoi(argv[i+1]);
+ }
+ // Allow gpio channel value i.e pull up or pull down to be specified in commandline
+ else if (strcmp(argv[i], "-gpiochannelvalue") == 0)
+ {
+ if (argc > i+1)
+ gpioChannelValue = atoi(argv[i+1]);
+ }
}
+ if (gpio_trigger)
+ gpio = new GpioInput(gpioChannel);
+
+
//==========================
// Wait for drive device to show up
QTime t;
@@ -469,7 +487,7 @@ int main(int argc, char *argv[])
// or no OS is installed (/settings/installed_os.json does not exist)
bool bailout = !runinstaller
&& !force_trigger
- && !(gpio && (gpio->value() == 0 ))
+ && !(gpio && (gpio->value() == gpioChannelValue ))
&& hasInstalledOS(drive);
if (bailout && keyboard_trigger)
diff --git a/recovery/mainwindow.cpp b/recovery/mainwindow.cpp
index e83eaad0..7b0ceb72 100644
--- a/recovery/mainwindow.cpp
+++ b/recovery/mainwindow.cpp
@@ -31,9 +31,9 @@
#include "termsdialog.h"
#define DBG_LOCAL 0
-#define LOCAL_DO_DBG 1
-#define LOCAL_DBG_FUNC 1
-#define LOCAL_DBG_OUT 1
+#define LOCAL_DO_DBG 0
+#define LOCAL_DBG_FUNC 0
+#define LOCAL_DBG_OUT 0
#define LOCAL_DBG_MSG 0
#include "mydebug.h"
@@ -187,6 +187,7 @@ MainWindow::MainWindow(const QString &drive, const QString &defaultDisplay, KSpl
_processedImages = 0;
_numListsToDownload=0;
+
QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
ui->advToolBar->addWidget(spacer);
@@ -206,6 +207,19 @@ MainWindow::MainWindow(const QString &drive, const QString &defaultDisplay, KSpl
ui->groupBox->setVisible(toolbar_index==TOOLBAR_MAIN);
ui->groupBoxUsb->setVisible(toolbar_index==TOOLBAR_ARCHIVAL);
+ //====================
+ QAction *foo2 = new QAction(ui->toolBar_2);
+ foo2->setShortcut(Qt::Key_Escape);
+ connect(foo2, SIGNAL(triggered()), this, SLOT(on_actionCancel_triggered()));
+ ui->toolBar_2->addAction(foo2);
+
+ QAction *foo3 = new QAction(ui->toolBar_3);
+ foo3->setShortcut(Qt::Key_Escape);
+ connect(foo3, SIGNAL(triggered()), this, SLOT(on_actionCancel_triggered()));
+ ui->toolBar_3->addAction(foo3);
+ //====================
+
+
QString cmdline = getFileContents("/proc/cmdline");
_networkTimeout=8000;
@@ -603,11 +617,13 @@ void MainWindow::checkPinnFirmware()
}
else if (firmwareState.isEmpty())
{
+ //Comment out because I don't want to downgrade automatically.
+
/* Just installed or upgraded on legacy h/w, so installed firmware=latest */
/* => downgrade firmware */
- QProcess::execute("/mnt/changefirmware down");
- g_nofirmware = true;
- qDebug()<< "Firmware downgraded";
+ //QProcess::execute("/mnt/changefirmware down");
+ //g_nofirmware = true;
+ //qDebug()<< "Firmware downgraded";
}
}
updateFirmware_button();
@@ -2406,7 +2422,7 @@ QListWidgetItem *MainWindow::findItemByName(const QString &name)
return item;
}
}
- DBG("not found")
+ DBG("not found");
return NULL;
}
@@ -2972,19 +2988,21 @@ void MainWindow::startImageWrite()
if (slidesFolders.isEmpty())
slidesFolder.append("/mnt/defaults/slides");
- _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, _drive, this);
+ _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, this); //_drive
_qpssd->setWindowTitle("Installing Images");
connect(imageWriteThread, SIGNAL(parsedImagesize(qint64)), _qpssd, SLOT(setMaximum(qint64)));
connect(imageWriteThread, SIGNAL(completed(int)), this, SLOT(onCompleted(int)));
connect(imageWriteThread, SIGNAL(error(QString)), this, SLOT(onError(QString)));
connect(imageWriteThread, SIGNAL(errorContinue(QString)), this, SLOT(onErrorContinue(QString)), Qt::BlockingQueuedConnection);
connect(imageWriteThread, SIGNAL(statusUpdate(QString)), _qpssd, SLOT(setLabelText(QString)));
- connect(imageWriteThread, SIGNAL(runningMKFS()), _qpssd, SLOT(pauseIOaccounting()), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(finishedMKFS()), _qpssd , SLOT(resumeIOaccounting()), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(newDrive(const QString&)), _qpssd , SLOT(changeDrive(const QString&)), Qt::BlockingQueuedConnection);
connect(imageWriteThread, SIGNAL(checksumError(const QString&, const QString&, QMessageBox::ButtonRole*)), this, SLOT(onChecksumError(QString,QString,QMessageBox::ButtonRole*)),Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(pause(uint *)), _qpssd, SLOT(captureIOaccounting( uint * )), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(resume( uint )), _qpssd , SLOT(restoreIOaccounting( uint )), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(newDrive(const QString&,eProgressMode)), _qpssd , SLOT(setDriveMode(const QString&,eProgressMode)), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(startAccounting()), _qpssd, SLOT(startAccounting()), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(stopAccounting()), _qpssd , SLOT(stopAccounting()), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(idle()), _qpssd , SLOT(idle()));
+ connect(imageWriteThread, SIGNAL(cont()), _qpssd , SLOT(cont()));
+ connect(imageWriteThread, SIGNAL(consolidate()), _qpssd , SLOT(consolidate()));
+ connect(imageWriteThread, SIGNAL(finish()), _qpssd , SLOT(finish()));
imageWriteThread->start();
hide();
_qpssd->exec();
@@ -3080,19 +3098,22 @@ void MainWindow::startImageReinstall()
if (slidesFolders.isEmpty())
slidesFolder.append("/mnt/defaults/slides");
- _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, _drive, this);
+ _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, this); //_drive
_qpssd->setWindowTitle("Re-Installing Images");
connect(imageWriteThread, SIGNAL(parsedImagesize(qint64)), _qpssd, SLOT(setMaximum(qint64)));
connect(imageWriteThread, SIGNAL(completed(int)), this, SLOT(onCompleted(int)));
connect(imageWriteThread, SIGNAL(error(QString)), this, SLOT(onError(QString)));
connect(imageWriteThread, SIGNAL(errorContinue(QString)), this, SLOT(onErrorContinue(QString)), Qt::BlockingQueuedConnection);
connect(imageWriteThread, SIGNAL(statusUpdate(QString)), _qpssd, SLOT(setLabelText(QString)));
- connect(imageWriteThread, SIGNAL(runningMKFS()), _qpssd, SLOT(pauseIOaccounting()), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(finishedMKFS()), _qpssd , SLOT(resumeIOaccounting()), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(newDrive(const QString&)), _qpssd , SLOT(changeDrive(const QString&)), Qt::BlockingQueuedConnection);
connect(imageWriteThread, SIGNAL(checksumError(const QString&, const QString&, QMessageBox::ButtonRole*)), this, SLOT(onChecksumError(QString,QString,QMessageBox::ButtonRole*)),Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(pause(uint *)), _qpssd, SLOT(captureIOaccounting( uint * )), Qt::BlockingQueuedConnection);
- connect(imageWriteThread, SIGNAL(resume( uint )), _qpssd , SLOT(restoreIOaccounting( uint )), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(newDrive(const QString&,eProgressMode)), _qpssd , SLOT(setDriveMode(const QString&,eProgressMode)), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(startAccounting()), _qpssd, SLOT(startAccounting()), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(stopAccounting()), _qpssd , SLOT(stopAccounting()), Qt::BlockingQueuedConnection);
+ connect(imageWriteThread, SIGNAL(idle()), _qpssd , SLOT(idle()));
+ connect(imageWriteThread, SIGNAL(cont()), _qpssd , SLOT(cont()));
+ connect(imageWriteThread, SIGNAL(consolidate()), _qpssd , SLOT(consolidate()));
+ connect(imageWriteThread, SIGNAL(finish()), _qpssd , SLOT(finish()));
+
imageWriteThread->start();
hide();
_qpssd->exec();
@@ -3107,7 +3128,7 @@ void MainWindow::startImageDownload()
// The drive is already mounted R/W from on_actionDownload_triggered
/* All meta files downloaded, extract slides tarball, and launch image download thread */
- MultiImageDownloadThread *imageDownloadThread = new MultiImageDownloadThread(0, _local);
+ MultiImageDownloadThread *imageDownloadThread = new MultiImageDownloadThread(0, _local, _osdrive);
QString folder, slidesFolder;
QStringList slidesFolders;
@@ -3216,9 +3237,10 @@ void MainWindow::startImageDownload()
if (slidesFolders.isEmpty())
slidesFolder.append("/mnt/defaults/slides");
- _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, _osdrive, this);
+ _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, this); //_osdrive
_qpssd->setWindowTitle("Downloading Images");
connect(imageDownloadThread, SIGNAL(parsedImagesize(qint64)), _qpssd, SLOT(setMaximum(qint64)));
+ connect(imageDownloadThread, SIGNAL(newDrive(const QString&,eProgressMode)), _qpssd , SLOT(setDriveMode(const QString&,eProgressMode)), Qt::BlockingQueuedConnection);
connect(imageDownloadThread, SIGNAL(completed()), this, SLOT(onCompleted()));
connect(imageDownloadThread, SIGNAL(error(QString)), this, SLOT(onError(QString)));
connect(imageDownloadThread, SIGNAL(errorContinue(QString)), this, SLOT(onErrorContinue(QString)), Qt::BlockingQueuedConnection);
@@ -3343,14 +3365,21 @@ void MainWindow::startImageBackup()
if (slidesFolders.isEmpty())
slidesFolder.append("/mnt/defaults/slides");
- _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, _osdrive, this, true);
+ _qpssd = new ProgressSlideshowDialog(slidesFolders, "", 20, this); //_osdrive, ePM_READSTATS
_qpssd->setWindowTitle("Backing Up Images");
connect(bt, SIGNAL(parsedImagesize(qint64)), _qpssd, SLOT(setMaximum(qint64)));
connect(bt, SIGNAL(completed(int)), this, SLOT(onCompleted(int)));
connect(bt, SIGNAL(error(QString)), this, SLOT(onError(QString)));
connect(bt, SIGNAL(statusUpdate(QString)), _qpssd, SLOT(setLabelText(QString)));
- connect(bt, SIGNAL(newDrive(const QString&)), _qpssd , SLOT(changeDrive(const QString&)), Qt::BlockingQueuedConnection);
+ connect(bt, SIGNAL(newDrive(const QString&,eProgressMode)), _qpssd , SLOT(setDriveMode(const QString&,eProgressMode)), Qt::BlockingQueuedConnection);
+ connect(bt, SIGNAL(startAccounting()), _qpssd, SLOT(startAccounting()), Qt::BlockingQueuedConnection);
+ connect(bt, SIGNAL(stopAccounting()), _qpssd , SLOT(stopAccounting()), Qt::BlockingQueuedConnection);
connect(bt, SIGNAL(newImage( QString)), this, SLOT(newImage( QString)));
+ connect(bt, SIGNAL(idle()), _qpssd , SLOT(idle()));
+ connect(bt, SIGNAL(cont()), _qpssd , SLOT(cont()));
+ connect(bt, SIGNAL(consolidate()), _qpssd , SLOT(consolidate()), Qt::BlockingQueuedConnection);
+ connect(bt, SIGNAL(finish()), _qpssd , SLOT(finish()));
+
bt->start();
hide();
_qpssd->exec();
@@ -3774,7 +3803,7 @@ void MainWindow::addImage(QVariantMap& m, QIcon &icon, bool &bInstalled)
DBG("...");
if ((witem) && (!bInstalled))
{
- DBG("witem && Not installed")
+ DBG("witem && Not installed");
QVariantMap existing_details = witem->data(Qt::UserRole).toMap();
bool bReplace=false;
@@ -3897,7 +3926,7 @@ void MainWindow::addImage(QVariantMap& m, QIcon &icon, bool &bInstalled)
else
{
//Add new OS to os list.
- DBG("Adding to list")
+ DBG("Adding to list");
if (recommended)
ug->insertItem(0, witem);
else
@@ -4071,7 +4100,7 @@ void MainWindow::on_actionClone_triggered()
//Reuse the existing Progress Slide Dialog
_qpd = new ProgressSlideshowDialog(DirList, "", 20);//Add dst_dev
_qpd->setWindowTitle("Clone SD Card");
- ((ProgressSlideshowDialog*)_qpd)->disableIOaccounting();
+ // ((ProgressSlideshowDialog*)_qpd)->disableIOaccounting();
connect(cloneThread, SIGNAL(setMaxProgress(qint64)), _qpd, SLOT(setMaximum(qint64)));
connect(cloneThread, SIGNAL(completed()), this, SLOT(onCloneCompleted()));
connect(cloneThread, SIGNAL(error(QString)), this, SLOT(onCloneError(QString)));
diff --git a/recovery/multiimagedownloadthread.cpp b/recovery/multiimagedownloadthread.cpp
index 397a7146..2630f72b 100644
--- a/recovery/multiimagedownloadthread.cpp
+++ b/recovery/multiimagedownloadthread.cpp
@@ -4,6 +4,8 @@
#include "util.h"
#include "mbr.h"
#include "partitioninfo.h"
+#include "progressslideshowdialog.h"
+
#include
#include
#include
@@ -15,8 +17,8 @@
#include
#include
-MultiImageDownloadThread::MultiImageDownloadThread(QObject *parent, QString local) :
- QThread(parent), _local(local), _extraSpacePerPartition(0), _part(5)
+MultiImageDownloadThread::MultiImageDownloadThread(QObject *parent, QString local, QString drive) :
+ QThread(parent), _local(local), _extraSpacePerPartition(0), _part(5), _drive(drive)
{
/* local is "/tmp/media/sd*" or "/mnt" (in future) */
allowResume(false);
@@ -36,6 +38,7 @@ void MultiImageDownloadThread::run()
{
/* Calculate space requirements */
quint64 totalDownloadSize = 0;
+ emit newDrive(_drive, ePM_WRITEDF);
foreach (QString folder, _images.keys())
{
@@ -115,11 +118,14 @@ bool MultiImageDownloadThread::processImage(const QString &folder, const QString
t1.start();
qDebug() << "Executing:" << cmd;
+ emit newDrive(_drive, ePM_WRITEDF);
+ emit startAccounting();
QProcess p;
p.setProcessChannelMode(p.MergedChannels);
p.start(cmd);
p.closeWriteChannel();
p.waitForFinished(-1);
+ emit stopAccounting();
QByteArray msg = p.readAll();
@@ -151,6 +157,8 @@ bool MultiImageDownloadThread::processImage(const QString &folder, const QString
downloadError = true;
}
+ emit consolidate();
+
if (downloadError)
{
//Delete os.json to hide partial OS from PINN
diff --git a/recovery/multiimagedownloadthread.h b/recovery/multiimagedownloadthread.h
index 774ad2ee..54090f11 100644
--- a/recovery/multiimagedownloadthread.h
+++ b/recovery/multiimagedownloadthread.h
@@ -1,6 +1,7 @@
#ifndef MultiImageDownloadThread_H
#define MultiImageDownloadThread_H
+#include "progressslideshowdialog.h"
#include
#include
#include
@@ -10,7 +11,7 @@ class MultiImageDownloadThread : public QThread
{
Q_OBJECT
public:
- explicit MultiImageDownloadThread(QObject *parent = 0, QString local="/mnt/");
+ explicit MultiImageDownloadThread(QObject *parent = 0, QString local="/mnt/", QString drive="");
void addImage(const QString &folder, const QString &flavour);
void allowResume(bool allow);
@@ -28,6 +29,7 @@ protected:
int _extraSpacePerPartition, _sectorOffset, _part;
QVariantList installed_os;
bool _allowResume;
+ QString _drive;
signals:
void error(const QString &msg);
@@ -35,8 +37,10 @@ signals:
void statusUpdate(const QString &msg);
void parsedImagesize(qint64 size);
void completed();
- void runningMKFS();
- void finishedMKFS();
+ void startAccounting();
+ void stopAccounting();
+ void consolidate();
+ void newDrive(const QString& drive, eProgressMode mode);
void imageWritten(QString Imagefile);
public slots:
diff --git a/recovery/multiimagewritethread.cpp b/recovery/multiimagewritethread.cpp
index 51f13e70..c18143e6 100644
--- a/recovery/multiimagewritethread.cpp
+++ b/recovery/multiimagewritethread.cpp
@@ -127,11 +127,13 @@ void MultiImageWriteThread::run()
numparts++;
if ( partition->wantMaximised() )
numexpandparts++;
- totalnominalsize += partition->partitionSizeNominal();
+ uint nominalsize = partition->partitionSizeNominal();
+ totalnominalsize += nominalsize;
totaluncompressedsize += partition->uncompressedTarballSize();
+
if (partition->fsType() == "ext4")
{
- totaluncompressedsize += /*0.035*/ 0.01 * totalnominalsize; /* overhead for file system meta data */
+ totaluncompressedsize += nominalsize / 20 ; /* overhead for file system meta data */
}
int reqPart = partition->requiresPartitionNumber();
if (reqPart)
@@ -363,8 +365,14 @@ void MultiImageWriteThread::run()
QList *partitions = image->partitions();
foreach (PartitionInfo *partition, *partitions)
{
- uint compressedSize = partition->uncompressedTarballSize(); //in MB
- totaluncompressedsize += compressedSize;
+ uint uncompressedSize = partition->uncompressedTarballSize(); //in MB
+ uint nominalsize = partition->partitionSizeNominal();
+
+ totaluncompressedsize += partition->uncompressedTarballSize();
+ if (partition->fsType() == "ext4")
+ {
+ totaluncompressedsize += nominalsize / 20 ; /* overhead for file system meta data */
+ }
if (partition->partitionDevice().contains("PARTUUID"))
{
@@ -373,9 +381,9 @@ void MultiImageWriteThread::run()
}
uint partitionSectors = getFileContents(sysclassblock(partition->partitionDevice())+"/size").trimmed().toUInt();
- if (compressedSize*2048 > partitionSectors)
+ if (uncompressedSize*2048 > partitionSectors)
{
- qDebug () << "CompressedSize=" <name()+tr(".\nPartition not big enough for new image."));
return;
}
@@ -699,7 +707,6 @@ QMessageBox::ButtonRole MultiImageWriteThread::processImage(OsInfo *image)
}
QByteArray partdevice = p->partitionDevice();
- emit newDrive(partdevice);
if ( (!_partition) && ( (_downloadMode == MODE_REINSTALL) || (_downloadMode == MODE_REINSTALLNEWER))) //@@ (not for replace)
{ //Use the existing partition label
@@ -718,31 +725,33 @@ QMessageBox::ButtonRole MultiImageWriteThread::processImage(OsInfo *image)
}
QMessageBox::ButtonRole result = QMessageBox::AcceptRole;
- uint paused=0;
_checksumError++;
do
{
_checksumError--;
- emit resume( paused ); //1st time through this does nothing, 2nd time restores what was captured
- emit pause( &paused ); //Capture the current ioaccounting
if (fstype == "raw")
{
emit statusUpdate(tr("%1: Writing OS image").arg(os_name));
+ emit newDrive(partdevice,ePM_WRITESTATS);
+ emit startAccounting();
result = dd(tarball, csumType, csum, partdevice);
}
else if (fstype.startsWith("partclone"))
{
emit statusUpdate(tr("%1: Writing OS image").arg(os_name));
+ emit newDrive(partdevice,ePM_WRITESTATS);
+ emit startAccounting();
result = partclone_restore(tarball, csumType, csum, partdevice);
}
else if (fstype != "unformatted")
{
- emit runningMKFS();
emit statusUpdate(tr("%1: Creating filesystem (%2)").arg(os_name, QString(fstype)));
+
+ emit idle();
if (!mkfs(partdevice, fstype, label, mkfsopt))
return QMessageBox::RejectRole;
- emit finishedMKFS();
+ emit cont();
if (!emptyfs)
{
@@ -758,13 +767,22 @@ QMessageBox::ButtonRole MultiImageWriteThread::processImage(OsInfo *image)
else
emit statusUpdate(tr("%1: Extracting filesystem").arg(os_name));
+ emit newDrive(partdevice,ePM_WRITEDF);
+ emit startAccounting();
result = untar(tarball,csumType, csum);
+ emit statusUpdate(tr("Syncing Filesystem"));
+ emit idle();
QProcess::execute("umount /mnt2");
+ emit cont();
}
}
+ emit stopAccounting();
+
} while (result == QMessageBox::NoRole); //retry
+ emit consolidate();
+
if (result != QMessageBox::AcceptRole)
return result;
@@ -1413,8 +1431,8 @@ QMessageBox::ButtonRole MultiImageWriteThread::untar(const QString &tarball, co
}
else if (tarballPath.endsWith(".zip"))
{
- /* Note: the image must be the only file inside the .zip */
- cmd += " | unzip -p";
+ /* Note: the image must be the only file inside the .zip. {This does not make sense for a tarball!} */
+ cmd += " "; /* Actually, if we just use bsdtar to unzip it, we may be able to unzip multiple files */
}
else if (tarballPath.endsWith(".tar"))
{
@@ -1473,7 +1491,11 @@ QMessageBox::ButtonRole MultiImageWriteThread::untar(const QString &tarball, co
if (answer != QMessageBox::AcceptRole)
return(answer);
}
+ else
+ emit statusUpdate(tr("Checksum OK"));
}
+ else
+ emit statusUpdate(tr("Finished downloading"));
}
if (p.exitCode() != 0)
diff --git a/recovery/multiimagewritethread.h b/recovery/multiimagewritethread.h
index 345b5bcd..b2364f37 100644
--- a/recovery/multiimagewritethread.h
+++ b/recovery/multiimagewritethread.h
@@ -1,6 +1,8 @@
#ifndef MULTIIMAGEWRITETHREAD_H
#define MULTIIMAGEWRITETHREAD_H
#include "config.h"
+#include "progressslideshowdialog.h"
+
#include
#include
#include
@@ -65,11 +67,13 @@ signals:
void statusUpdate(const QString &msg);
void parsedImagesize(qint64 size);
void completed(int arg);
- void runningMKFS();
- void finishedMKFS();
- void newDrive(const QString&);
- void pause(uint *paused);
- void resume(uint paused);
+ void newDrive(const QString&, eProgressMode);
+ void startAccounting();
+ void stopAccounting();
+ void consolidate();
+ void finish();
+ void idle();
+ void cont();
public slots:
};
diff --git a/recovery/mydebug.cpp b/recovery/mydebug.cpp
index 0dfb612b..72dd0129 100644
--- a/recovery/mydebug.cpp
+++ b/recovery/mydebug.cpp
@@ -1,47 +1,31 @@
#include "mydebug.h"
#include
-extern QString readexec(int log, const QString &cmd, int &errorcode);
+int MyDebug::_level = 0;
-int MyDebug::level = 0;
-
-MyDebug::MyDebug(const char * func) :
- name(func)
+MyDebug::MyDebug(const char * funcname, int display) :
+ _local_level(0), _name(funcname), _display(display)
{
#if DBG_FUNC
- QString output;
- //int errorcode;
- for (int i=0; i< level ; i++)
- output += " ";
- output += ">";
- output += name;
- qDebug() << output;
+ if (_display)
+ qDebug() << this->header() << ">" << _name;
#endif
- level++;
+ _level++;
+ _local_level++;
}
MyDebug::~MyDebug()
{
- level--;
+ _level--;
+ _local_level=0;
#if DBG_FUNC
- QString output;
- for (int i=0; i< level ; i++)
- output += " ";
- output += "<";
- output += name;
- qDebug() << output;
+ if (_display)
+ qDebug() << this->header() << "<" << _name;
#endif
}
-void MyDebug::outstring(QString out)
+const char * MyDebug::header()
{
-#if DBG_OUT
- QString output;
- for (int i=0; i< level ; i++)
- output += " ";
- output += out;
- qDebug() << output.toUtf8().constData();
-#else
- Q_UNUSED(out);
-#endif
+ QString out(" ");
+ return out.repeated(_level+1+_local_level).toLatin1().data();
}
diff --git a/recovery/mydebug.h b/recovery/mydebug.h
index c2ef480a..b41a686c 100644
--- a/recovery/mydebug.h
+++ b/recovery/mydebug.h
@@ -5,13 +5,13 @@
//Conditional GLOBAL flags
#define DO_DBG 0 //global debug enabler
-#define DBG_FUNC 0 //Debug entry/exit of functions
-#define DBG_OUT 0 //Debug output strings
-#define DBG_MSG 0 //Debug message boxes
+#define DBG_FUNC 0 //global Debug entry/exit of functions
+#define DBG_OUT 0 //global Debug output strings
+#define DBG_MSG 0 //global Debug message boxes
-#ifndef LOCAL_DO_DBG
-#define LOCAL_DO_DBG DO_DBG
+#ifndef LOCAL_DO_DBG //If the local debug does not exist
+#define LOCAL_DO_DBG DO_DBG //Use the global version
#endif
#ifndef LOCAL_DBG_FUNC
@@ -27,12 +27,12 @@
#endif
-#if DO_DBG && DBG_LOCAL
+#if DO_DBG && DBG_LOCAL //Use local debug where it is given
#define FILE_DO_DBG LOCAL_DO_DBG
#define FILE_DBG_FUNC LOCAL_DBG_FUNC
#define FILE_DBG_OUT LOCAL_DBG_OUT
#define FILE_DBG_MSG LOCAL_DBG_MSG
-#else
+#else //Else use the global file
#define FILE_DO_DBG DO_DBG
#define FILE_DBG_FUNC DBG_FUNC
#define FILE_DBG_OUT DBG_OUT
@@ -41,42 +41,53 @@
#if FILE_DO_DBG
- //macros when debugging is on
- #define MYDEBUG MyDebug dbg(__PRETTY_FUNCTION__);
- #if FILE_DBG_OUT
- #define DBG(x) dbg.outstring(x);
- #else
- #define DBG(x)
- #endif
+ #define MYDEBUG MyDebug dbg(__PRETTY_FUNCTION__, FILE_DBG_FUNC)
+ #define TRACE MYDEBUG;
+ #define PARAMS qDebug() << dbg.header() << (const char *)"Params:"
+ #define INDENT(n) dbg._local_level+=n
+ #define OUTDENT(n) dbg._local_level-=n
- #if FILE_DBG_MSG
- #define MSG() QMessageBox::warning(NULL, QString(__FILE__),QString(__PRETTY_FUNCTION__)+":#"+QString::number(__LINE__), QMessageBox::Close)
- #else
- #define MSG()
- #endif
+ #if FILE_DBG_OUT
+ #define DBG2 qDebug() << dbg.header() <<""
+ #define DBG(x) DBG2 << x
+ #else
+ #define DBG2
+ #define DBG
+ #endif
+
+ #if FILE_DBG_MSG
+ #define MSG() QMessageBox::warning(NULL, QString(__FILE__),QString(__PRETTY_FUNCTION__)+":#"+QString::number(__LINE__), QMessageBox::Close)
+ #else
+ #define MSG()
+ #endif
#else
-//macros when debugging is off
- #define DBG(x)
- #define MYDEBUG
- #define MSG()
-#endif
-#define TRACEFN MYDEBUG
-#define TRACE TRACEFN
+ #define MYDEBUG
+ #define TRACE
+ #define DBG2
+ #define PARAMS
+ #define INDENT(n)
+ #define OUTDENT(n)
+ #define DBG(x)
+ #define MSG(x)
+
+#endif
class MyDebug
{
public:
-
- explicit MyDebug(const char * func);
+ MyDebug(const char * funcname, int display=0);
~MyDebug();
- void outstring(QString out);
+ int _local_level;
+ const char * header();
private:
- QString name;
- static int level;
+ QString _name;
+ static int _level;
+ int _display;
};
+
#endif // MYDEBUG_H
diff --git a/recovery/optionsdialog.ui b/recovery/optionsdialog.ui
index 05722a1f..192a9a17 100644
--- a/recovery/optionsdialog.ui
+++ b/recovery/optionsdialog.ui
@@ -28,7 +28,7 @@
- 1
+ 3
@@ -43,7 +43,7 @@
PREVENTS any noobsconfig customisations from being applied to an OS on installation
- noobsconfig
+ noobs&config
@@ -53,7 +53,10 @@
Reserve some space on PINN's partition (MB)
- reserve=
+ re&serve=
+
+
+ eb_reserve_space
@@ -63,7 +66,10 @@
Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- configpath=
+ &configpath=
+
+
+ eb_configpath
@@ -87,7 +93,7 @@
Selecting this will erase all of your OSes
- runinstaller
+ &runinstaller
@@ -97,7 +103,7 @@
Prevents PINN from checking for self updates
- no_update
+ no_&update
@@ -107,7 +113,7 @@
Force PINN to self-update whenever a new version is detected
- forceupdatepinn
+ &forceupdatepinn
@@ -117,7 +123,7 @@
DO not update the firmware of old OSes on installation
- nofirmware
+ nofirm&ware
@@ -127,7 +133,7 @@
Selects all OSes where the most recent one is on the SD card
- allsd
+ &allsd
@@ -137,7 +143,7 @@
Selects all OSes where the most recent one is on a local USB drive
- allusb
+ all&usb
@@ -147,7 +153,7 @@
Selects all OSes where the most recent one is on remote repositories.
- allnetwork
+ all&network
@@ -157,7 +163,7 @@
Ensures all installed OSes are selected again.
- allinstalled
+ all&installed
@@ -167,7 +173,7 @@
Waits for all OSes on the SD card to be listed
- waitsd
+ &waitsd
@@ -177,7 +183,7 @@
Waits for all OSes on local USBs to be listed
- waitusb
+ waitus&b
@@ -187,7 +193,7 @@
Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
+ waitnetwor&k
@@ -197,7 +203,7 @@
Waits for OSes from all sources to be listed
- waitall
+ waita&ll
@@ -224,7 +230,7 @@
Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
+ sil&entreinstallnewer
@@ -234,14 +240,17 @@
Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
+ &silentinstall
-
- select=
+ selec&t=
+
+
+ lv_select
@@ -262,7 +271,7 @@
Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
+ no_&default_source
@@ -272,7 +281,7 @@
Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
+ disable&usbimages
@@ -282,7 +291,7 @@
Prevent OSes stored on the SD card from being used.
- disablesdimages
+ disable&sdimages
@@ -292,7 +301,7 @@
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.
- showall
+ &showall
@@ -302,7 +311,10 @@
Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
+ repo_&list=
+
+
+ eb_repo_list
@@ -312,7 +324,10 @@
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
+ &repo=
+
+
+ eb_repo
@@ -329,7 +344,10 @@
: Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
+ alt_&image_source=
+
+
+ eb_alt_image_source
@@ -364,7 +382,10 @@
When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
+ &remotetimeout=<secs>
+
+
+ eb_remotetimeout
@@ -374,7 +395,7 @@
Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
+ &forcetrigger
@@ -384,7 +405,7 @@
Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
+ &gpiotriggerenable
@@ -394,7 +415,10 @@
This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
+ &networktimeout=<secs>
+
+
+ eb_networktimeout
@@ -404,7 +428,7 @@
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
+ &keyboardtriggerenable
@@ -442,7 +466,7 @@
Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
- vncinstall
+ v&ncinstall
@@ -452,7 +476,7 @@
Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
+ &vncshare
@@ -462,7 +486,7 @@
Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
+ &ssh
@@ -472,7 +496,7 @@
This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
+ &rescueshell
@@ -482,7 +506,7 @@
Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
+ disablesafe&mode
@@ -492,7 +516,7 @@
A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
+ &dsi
@@ -502,7 +526,7 @@
Prevents the list of OSes from being grouped into categories.
- no_group
+ no_&group
@@ -512,7 +536,7 @@
Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
+ no_&cursor
@@ -522,7 +546,7 @@
Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
+ &wallpaper_resize
@@ -532,7 +556,10 @@
Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
+ dis&play=
+
+
+ dd_display
@@ -542,7 +569,10 @@
Changes the style of the windows
- style=
+ s&tyle=
+
+
+ dd_style
@@ -552,7 +582,10 @@
Changes the default timeout allowed before an OS is booted without any selection.
- bootmenutimeout=<secs>
+ b&ootmenutimeout=<secs>
+
+
+ eb_bootmenutimeout
@@ -562,7 +595,10 @@
To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &background=<r,g,b>
+
+
+ eb_background
diff --git a/recovery/progressslideshowdialog.cpp b/recovery/progressslideshowdialog.cpp
index 4719ce06..f8204240 100644
--- a/recovery/progressslideshowdialog.cpp
+++ b/recovery/progressslideshowdialog.cpp
@@ -1,6 +1,11 @@
#include "progressslideshowdialog.h"
#include "ui_progressslideshowdialog.h"
#include "util.h"
+#define DBG_LOCAL 1
+#define LOCAL_DO_DBG 0
+#define LOCAL_DBG_FUNC 0
+#define LOCAL_DBG_OUT 0
+#define LOCAL_DBG_MSG 0
#include "mydebug.h"
#include
@@ -13,22 +18,25 @@
/* Progress dialog with slideshow
*
* Initial author: Floris Bos
- * Maintained by Raspberry Pi
+ * Maintained by ProCount
*
* See LICENSE.txt for license details
*
*/
-ProgressSlideshowDialog::ProgressSlideshowDialog(const QStringList &slidesDirectories, const QString &statusMsg, int changeInterval, const QString &drive, QWidget *parent, bool readmode) :
+//@@ Constructor with parameters & initiliasers
+ProgressSlideshowDialog::ProgressSlideshowDialog(const QStringList &slidesDirectories, const QString &statusMsg, int changeInterval, QWidget *parent) :
QDialog(parent),
- _drive(drive),
+ _drive(""),
_pos(0),
_changeInterval(changeInterval),
_maxSectors(0),
_pausedAt(0),
- _readmode(readmode),
+ _totalSize(0),
+ _accountMode(ePM_NONE),
ui(new Ui::ProgressSlideshowDialog)
{
+ TRACE
ui->setupUi(this);
setLabelText(statusMsg);
@@ -89,33 +97,54 @@ ProgressSlideshowDialog::ProgressSlideshowDialog(const QStringList &slidesDirect
_timer.start(changeInterval * 1000);
}
connect(&_iotimer, SIGNAL(timeout()), this, SLOT(updateIOstats()));
- enableIOaccounting();
+
+ //enableIOaccounting();
+ _t1.start();
+ QProcess::execute("rm /tmp/progress");
}
+//@@ ok
ProgressSlideshowDialog::~ProgressSlideshowDialog()
{
+ TRACE
+ _iotimer.stop();
+ finish();
delete ui;
}
+//@@ ok
void ProgressSlideshowDialog::setLabelText(const QString &text)
{
+ TRACE
QString txt = text;
txt.replace('\n',' ');
ui->statusLabel->setText(txt);
//qDebug() << text;
}
+//@@ ok
void ProgressSlideshowDialog::setMBWrittenText(const QString &text)
{
+ TRACE
QString txt = text;
txt.replace('\n',' ');
ui->mbwrittenLabel->setText(txt);
//qDebug() << text;
}
+//@@ Manually set progress bar
+void ProgressSlideshowDialog::updateProgress(qint64 value)
+{
+ TRACE
+ int fraction = (int)(value>>9);
+ ui->progressBar->setValue(fraction);
+ //qDebug() << "updateProgress " << fraction;
+}
+//@@ ok
void ProgressSlideshowDialog::nextSlide()
{
+ TRACE
if (++_pos >= _slides.size())
_pos = 0;
@@ -126,66 +155,10 @@ void ProgressSlideshowDialog::nextSlide()
/* IO accounting functionality for analyzing SD card write speed / showing progress */
-void ProgressSlideshowDialog::enableIOaccounting()
-{
- _sectorsStart = sectorsAccessed();
- _t1.start();
- _iotimer.start(1000);
- QProcess::execute("rm /tmp/progress");
-}
-
-void ProgressSlideshowDialog::disableIOaccounting()
-{
- _iotimer.stop();
- ui->mbwrittenLabel->setText("");
-}
-
-void ProgressSlideshowDialog::captureIOaccounting(uint *paused)
-{
- TRACE
- if (paused)
- {
- *paused = sectorsAccessed()-_sectorsStart;
- }
- DBG (QString::number(*paused));
-}
-
-void ProgressSlideshowDialog::restoreIOaccounting(uint paused)
-{
- TRACE
- DBG (QString::number(paused));
- _iotimer.stop();
- if (paused)
- {
- _sectorsStart = sectorsAccessed()-paused;
- updateIOstats();
- }
- _iotimer.start(1000);
-}
-
-void ProgressSlideshowDialog::pauseIOaccounting()
-{
- _iotimer.stop();
- _pausedAt = sectorsAccessed();
-
-}
-
-void ProgressSlideshowDialog::resumeIOaccounting()
-{
- _sectorsStart += sectorsAccessed()-_pausedAt;
- _iotimer.start(1000);
-}
-
-void ProgressSlideshowDialog::changeDrive(const QString &drive)
-{
- pauseIOaccounting();
- _drive = drive;
- resumeIOaccounting();
-}
-
-
+//@@ Setup total size
void ProgressSlideshowDialog::setMaximum(qint64 bytes)
{
+ TRACE
/* restrict to size of 1TB since the progressbar expects an int32 */
/* to prevent overflow */
if (bytes > 1099511627775LL) /* == 2147483648 * 512 -1*/
@@ -194,10 +167,64 @@ void ProgressSlideshowDialog::setMaximum(qint64 bytes)
ui->progressBar->setMaximum(_maxSectors);
}
+//@@ Setup parameters for accounting for this partition
+void ProgressSlideshowDialog::setDriveMode(const QString &drive, eProgressMode mode)
+{
+ TRACE
+ _drive = drive;
+ _accountMode = mode;
+}
+
+//@@ Start accounting
+void ProgressSlideshowDialog::startAccounting()
+{
+ TRACE
+ _sectorsStart = sectorsAccessed();
+ _iotimer.start(1000);
+}
+
+//@@ Stop accounting
+void ProgressSlideshowDialog::stopAccounting()
+{
+ TRACE
+ _iotimer.stop();
+}
+
+void ProgressSlideshowDialog::idle()
+{
+ TRACE
+ ui->progressBar->setMaximum(0);
+}
+
+void ProgressSlideshowDialog::cont()
+{
+ TRACE
+ ui->progressBar->setMaximum(_maxSectors);
+}
+
+//@@ Consolidate
+void ProgressSlideshowDialog::consolidate()
+{
+ TRACE
+ _totalSize += sectorsAccessed()-_sectorsStart;
+ _sectorsStart = sectorsAccessed();
+}
+
+
+void ProgressSlideshowDialog::finish()
+{
+ TRACE
+ //Force progress bar and /tmp/progress to display 100%
+ _totalSize = _maxSectors;
+ updateIOstats();
+}
+
+//@@ Update stats
void ProgressSlideshowDialog::updateIOstats()
{
+ TRACE
static int last_percent=-1;
- uint sectors = sectorsAccessed()-_sectorsStart;
+ uint sectors = _totalSize + sectorsAccessed()-_sectorsStart;
double sectorsPerSec = sectors * 1000.0 / _t1.elapsed();
if (_maxSectors)
@@ -214,7 +241,7 @@ void ProgressSlideshowDialog::updateIOstats()
uint hrs = remaining ;
QString mode;
- if (_readmode)
+ if (_accountMode==ePM_READSTATS)
mode=tr("%1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6");
else
mode=tr("%1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6");
@@ -227,7 +254,11 @@ void ProgressSlideshowDialog::updateIOstats()
.arg(mins,2,10,QLatin1Char( '0' ))
.arg(secs,2,10,QLatin1Char( '0' )));
- int percent = (100*sectors)/_maxSectors;
+ int percent;
+ if (_maxSectors>0)
+ percent = (100*sectors)/_maxSectors;
+ else
+ percent = last_percent;
if (last_percent != percent)
{
last_percent=percent;
@@ -243,7 +274,7 @@ void ProgressSlideshowDialog::updateIOstats()
else
{
QString mode;
- if (_readmode)
+ if (_accountMode==ePM_READSTATS)
mode=tr("%1 MB read (%2 MB/sec)");
else
mode=tr("%1 MB written (%2 MB/sec)");
@@ -265,15 +296,10 @@ void ProgressSlideshowDialog::updateIOstats()
}
}
-void ProgressSlideshowDialog::updateProgress(qint64 value)
-{
- int fraction = (int)(value>>9);
- ui->progressBar->setValue(fraction);
- //qDebug() << "updateProgress " << fraction;
-}
-
+//@@ Get current progress
uint ProgressSlideshowDialog::sectorsAccessed()
{
+ TRACE
/* Poll kernel counters to get number of bytes written
*
* Fields available in /sys/block//stat
@@ -294,21 +320,32 @@ uint ProgressSlideshowDialog::sectorsAccessed()
* time_in_queue milliseconds total wait time for all requests
*/
- int field=6;
- if (_readmode)
- field=2;
+ static uint numsectors=0;
- uint numsectors=0;
+ if (_accountMode==ePM_WRITEDF)
+ {
+ int errorcode;
+ QString cmd = "sh -c \"df -k | grep "+_drive+" | sed -e 's/ \\+/ /g' | cut -d ' ' -f 3\"";
+ QString result =readexec(false, cmd, errorcode);
+ if (!result.isEmpty())
+ numsectors = 2* result.toUInt();
+ }
+ else if (_accountMode!=ePM_NONE)
+ {
+ int field=6;
+ if (_accountMode==ePM_READSTATS)
+ field=2;
- QFile f(sysclassblock(_drive)+"/stat");
- f.open(f.ReadOnly);
- QByteArray ioline = f.readAll().simplified();
- f.close();
+ QFile f(sysclassblock(_drive)+"/stat");
+ f.open(f.ReadOnly);
+ QByteArray ioline = f.readAll().simplified();
+ f.close();
- QList stats = ioline.split(' ');
+ QList stats = ioline.split(' ');
- if (stats.count() >= field)
- numsectors = stats.at(field).toUInt(); /* Read or write sectors */
+ if (stats.count() >= field)
+ numsectors = stats.at(field).toUInt(); /* Read or write sectors */
+ }
if (numsectors > 2147483647) //Maybe use MAX_INT from limits.h?
numsectors = 2147483647;
diff --git a/recovery/progressslideshowdialog.h b/recovery/progressslideshowdialog.h
index deeedc83..d169edcb 100644
--- a/recovery/progressslideshowdialog.h
+++ b/recovery/progressslideshowdialog.h
@@ -18,37 +18,45 @@ namespace Ui {
class ProgressSlideshowDialog;
}
+typedef enum progressmode_tag
+{
+ ePM_NONE=0,
+ ePM_WRITESTATS,
+ ePM_WRITEDF,
+ ePM_READSTATS
+} eProgressMode;
+
class ProgressSlideshowDialog : public QDialog
{
Q_OBJECT
public:
- explicit ProgressSlideshowDialog(const QStringList &slidesDirectories, const QString &statusMsg = "", int changeInterval = 20, const QString &drive = "/dev/mmcblk0", QWidget *parent = 0, bool readmode=false);
+ explicit ProgressSlideshowDialog(const QStringList &slidesDirectories, const QString &statusMsg = "", int changeInterval = 20, QWidget *parent = 0);
~ProgressSlideshowDialog();
- void enableIOaccounting();
- void disableIOaccounting();
public slots:
void setLabelText(const QString &text);
void setMBWrittenText(const QString &text);
- void setMaximum(qint64 bytes);
- void nextSlide();
- void updateIOstats();
- void pauseIOaccounting();
- void resumeIOaccounting();
- void captureIOaccounting(uint *paused=NULL);
- void restoreIOaccounting(uint paused=0);
void updateProgress(qint64 value);
- void changeDrive(const QString &drive);
+ void nextSlide();
+ void setMaximum(qint64 bytes);
+ void setDriveMode(const QString &drive, eProgressMode mode);
+ void startAccounting();
+ void stopAccounting();
+ void idle();
+ void cont();
+ void consolidate();
+ void finish();
+ void updateIOstats();
protected:
QString _drive;
QStringList _slides;
int _pos, _changeInterval;
- uint _sectorsStart, _maxSectors, _pausedAt;
+ uint _sectorsStart, _maxSectors, _pausedAt, _totalSize;
QTimer _timer, _iotimer;
QTime _t1;
- bool _readmode;
+ eProgressMode _accountMode;
uint sectorsAccessed();
diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
index 6ee037e7..83dbdd7f 100644
--- a/recovery/translation_ae.ts
+++ b/recovery/translation_ae.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
إنهاء الكتابة (مزامنة)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -690,543 +691,543 @@ WARNING: This will erase all data on your SD card
W
- Setting up SD card
SD اعداد بطاقة
- RECOMMENDED
اوصي
- Confirm
تاكيد
- Error mounting settings partition
خطا في تركيب قسم إعدادات
- Persistent settings partition seems corrupt. Reformat?
تقسيم الأعدادات الدائم يبدو فاسد. إعادة صيغة؟
- Reformat failed
إعادة الصيغة فشلت
- SD card might be damaged
معطوبة SD قد تكون بطاقة
- Please wait while PINN initialises
يشغل PINN الرجاء الإنتظار بينما
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Error
خطا
- Display Mode Changed
نمط العرض تغير
- HDMI preferred mode
المفضل HDMI نمط
- Waiting for SD card (settings partition)
(اعدادات التقسيم) SD إنتظار بطاقة
- Mounting settings partition
إعدادات التقسيم المتزايد
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
بطاقة SD
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
التالي لم يدعم على هذا تنقيح النسبة الثابتة توت عليق وقد يخفق في الاقلاع أو إشتغال بشكل صحيح OSes تحذير: أنظمة التشغيل الغير متوافقة إكتشفت:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS (es) ثبت بنجاح
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
HDMI الوضع الأمن
- composite PAL mode
وضع PAL المركب
- composite NTSC mode
وضع NTSC المركب
- Display mode changed to %1
Would you like to make this setting permanent?
تم تغيير وضع العرض إلى %1
هل ترغب في جعل هذا الاعداد دائما ؟
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
خطا في تحميل قائمه التوزيع من الإنترنت:
- Download error
خطا في التحميل
- Error parsing repolist.json downloaded from server
خطا في تحليل أعاده التشغيل. json التحميل من الخادم
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
مطلوب الوصول إلى الشبكة لاستخدام المكونات البينية بدون الصور المحلية. الرجاء تحديد شبكه wifi الخاصة بك في الشاشة التالية.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
مطلوب الوصول إلى الشبكة السلكية لاستخدام pinoy بدون الصور المحلية. الرجاء إدخال كبل شبكه اتصال في منفذ الشبكة.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
هل تريد بالتاكيد أعاده تهيئه محرك الاقراص '%1' لاستخدامه مع الشبكة PINN ؟ سيتم حذف كافة البيانات الموجودة علي محرك!
- This will erase all content on the device '%s'. Are you sure?
سيؤدي ذلك إلى مسح كافة المحتويات الموجودة علي الجهاز '%s'. هل أنت متأكد؟
- Clone SD Card
إستنسخ بطاقة SD
- Yes
نعم
- No
لا
- Clone Completed
اكتمل الاستنساخ
- Clone Completed Successfully
تم إكمال النسخ بنجاح
- Error downloading update file
حدث خطا اثناء تنزيل ملف التحديث
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN تحديث
- A new version of PINN is available
يتوفر إصدار جديد من الشبكة PINN
- Do you want to download this version?
هل تريد تحميل هذا الإصدار ؟
- Downloading Update
تنزيل التحديث
- Press ESC to cancel
اضغط هروب لالغاء الامر
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
خطا في توزيع القائمة. json تحميلها من الخادم
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- PINN v%1 - Built: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
بحاجة
- Available
متاح
- Error downloading meta file
حدث خطأ أثناء تنزيل ملف ميتا
- Error writing downloaded file to SD card. SD card or file system may be damaged.
حدث خطأ أثناء كتابة الملف الذي تم تنزيله إلى بطاقة SD . قد تتلف بطاقة SD أو نظام الملفات.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
أعاده تهيئه محرك الاقراص ؟
- No network access
لا يوجد وصول إلى الشبكة
- Wired network access is required for this feature. Please insert a network cable into the network port.
مطلوب الوصول إلى الشبكة السلكية لهذه الميزة. الرجاء إدخال كبل شبكه اتصال في منفذ الشبكة.
@@ -1234,37 +1235,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
إنهاء الكتابة (مزامنة)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
خطا في تنزيل الكره أو استخراجها
- Finished downloading %1
@@ -1282,51 +1283,51 @@ Booting this drive again will re-instate PINN's partition structure.لا يمكن تثبيت RISCOS حجم قسم الاسترداد كبير جدا.
- Operating system cannot require a system partition (1,5)
نظام التشغيل لا يمكن أن يتطلب قسم النظام (1،5)
- Operating system cannot claim both primary partitions 2 and 4
يتعذر على نظام التشغيل المطالبة بكل من القسمين الأساسيين 2 و 4
- Not enough disk space. Need %1 MB, got %2 MB
ليس بما فيه الكفاية سعة قرص. بحاجة %1 م ب، أصبح %2 م ب
- Finish writing (sync)
إنهاء الكتابة (مزامنة)
- File '%1' does not exist
الملف '%1 ' غير موجود
- %1: Writing OS image
%1: كتابه صوره نظام التشغيل
- %1: Mounting file system
%1: نظام الملفات المتصاعد
- %1: Error mounting file system
%1: خطا في تركيب نظام الملفات
- %1: Creating filesystem (%2)
%1: إنشاء ملفات الخادم (%2)
@@ -1341,169 +1342,184 @@ Booting this drive again will re-instate PINN's partition structure.لا يمكن تثبيت RISCOS . قيمه أزاحه RISCOS مفقوده.
- More than one operating system requires partition number %1
يتطلب أكثر من نظام تشغيل رقم القسم %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
أزاحه القسم الثابت منخفضه جدا
- Writing partition table
كتابه جدول الأقسام
- Writing boot partition table
كتابه جدول قسم الاقلاع
- Zero'ing start of each partition
بدء تشغيل كل قسم
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
خطا في قراءه جدول الأقسام الموجود
- Error creating partition table
خطا في إنشاء جدول الأقسام
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: تحميل الملفات واستخراجها
- %1: Extracting filesystem
%1: استخراج الملفات
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: تركيب قسم FAT
- %1: Creating os_config.json
%1: انشاء os_config.json
- %1: Saving display mode to config.txt
%1: حفظ وضع العرض إلى config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
%1:تشغيل البرنامج النصي لإعداد القسم
- %1: Error executing partition setup script
%1:حدث خطأ أثناء تنفيذ البرنامج النصي لإعداد القسم
- %1: Configuring flavour
%1: تكوين نكهة
- %1: Unmounting FAT partition
%1: إلغاء تحميل القسم FAT
- %1: Error unmounting
%1:خطا في إلغاء التركيب
- %1: Checking firmware update
- Error creating file system
خطا في إنشاء نظام الملفات
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
ملحق ملف تنسيق الضغط غير معروف. تتوقع .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
خطا في تنزيل الكره أو استخراجها
- Error downloading or writing OS to SD card
خطأ في تحميل أو كتابة نظام التشغيل إلى بطاقة SD
@@ -1527,7 +1543,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1537,500 +1554,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2172,22 +2189,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 م ب كتبت (%2 م ب /ث)
@@ -2276,37 +2293,37 @@ Are you sure?
لا واجات wifi متوفرة
- Authenticated but still waiting for DHCP lease
مصادقه ولكن لا يزال في انتظار تاجير DHCP
- Connecting to wifi failed
فشل الاتصال ب wifi
- Connecting to the wifi access point failed. Check your password
فشل الاتصال بنقطه وصول wifi. التحقق من كلمه السر
- Cancel
الغاء الامر
- Releasing old DHCP lease
إصدار إيجار DHCP قديم
- Disconnecting
قطع
- Connecting
اتصال
diff --git a/recovery/translation_ast.ts b/recovery/translation_ast.ts
index 08bb034e..ce0fc27d 100644
--- a/recovery/translation_ast.ts
+++ b/recovery/translation_ast.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Finóse cola escritura (sincronizando)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,542 +692,542 @@ AVISU: Esto desaniciará tolos datos na to tarxeta SD
- Setting up SD card
Configurando tarxeta SD
- Error mounting settings partition
Fallu montando la partición d'axustes
- Waiting for SD card (settings partition)
- Mounting settings partition
- Persistent settings partition seems corrupt. Reformat?
Paecen toyíos la partición d'axustes persistentes. ¿Reformatiar?
- Reformat failed
Reformatéu fallíu
- SD card might be damaged
Quiciabes tea dañada la tarxeta SD
- Main Menu
- Archival
- Maintenance
- Please wait while PINN initialises
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- RECOMMENDED
ACONSEYÁU
- ERROR
- Error: Some OSes are not available:
- Confirm
Confirmar
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed with errors.
See debug log for details
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Avisu: Deteutáronse incompatibilidaes. Los SO de darréu nun tán sofitaos pola to revisión de Raspberry Pi y quiciabes fallen al arrancar o furrular correutamente:
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- OS(es) Installed Successfully
SO(s) instaláu(os) con ésitu
- Error
Fallu
- PINN v%1 - Built: %2 (%3) %4
- HDMI preferred mode
Mou preferíu de HDMI
- HDMI safe mode
Mou seguru de HDMI
- composite PAL mode
mou PAL compuestu
- composite NTSC mode
mou NTSC compuestu
- Display Mode Changed
Camudóse'l mou de pantalla
- Display mode changed to %1
Would you like to make this setting permanent?
Camudóse'l mou de pantalla a %1
¿Prestaríate afitar dafechu esti axuste?
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- No network access
Ensin accesu de rede
- Wired network access is required for this feature. Please insert a network cable into the network port.
Ríquese l'accesu a rede cableada pa esta carauterística. Por favor inxerta un cable de rede nel so puertu.
- Error downloading distribution list from Internet:
- Download error
Fallu de descarga
- Error parsing list.json downloaded from server
Fallu analizando'l list.json baxáu del sirvidor
- Needed
Necesarios
- Available
Disponible
- Error downloading meta file
Fallu baxando'l ficheru meta
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Fallu baxando'l ficheru a la tarxeta SD. Quiciabes tean dañaos o'l sistema ficheros o la tarxeta SD.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1234,37 +1235,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Finóse cola escritura (sincronizando)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Fallu baxando o estrayendo'l comprimíu
- Finished downloading %1
@@ -1292,218 +1293,233 @@ Booting this drive again will re-instate PINN's partition structure.Nun pue instalase RISCOS. El tamañu de la partción recovery ye pergrande.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Nun hai espaciu abondo nel discu. Necesítense %1 MB, consiguiéronse %2 MB
- Finish writing (sync)
Finóse cola escritura (sincronizando)
- File '%1' does not exist
Nun esiste'l ficheru «%1»
- Fixed partition offset too low
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
%1:Escribiendo imaxe de SO
- %1: Creating filesystem (%2)
%1: Creando'l sistema ficheros (%2)
- %1: Mounting file system
%1:Montando'l sistema ficheros
- %1: Error mounting file system
%1:Fallu montando'l sistema ficheros
- %1: Downloading and extracting filesystem
%1:Baxando y estrayendo'l sistema ficheros
- %1: Extracting filesystem
%1: Estrayendo'l sistema ficheros
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: Montando partición FAT
- %1: Creating os_config.json
%1: Creando os_config.json
- %1: Saving display mode to config.txt
%1: Guardando'l mou de pantalla a config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
%1:Executando'l script de configuración de particiones
- %1: Error executing partition setup script
%1: Fallu na execución del script de configuración de particiones
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1:Desmontando partición FAT
- %1: Error unmounting
%1:Fallu desmontando
- %1: Checking firmware update
- Error creating file system
Fallu creando'l sistema ficheros
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Desconozse la estensión del formatu del ficheru de compresión. Esperábase .lzo, .gz, .xz, .bz2 o .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Fallu baxando o estrayendo'l comprimíu
- Error downloading or writing OS to SD card
Fallu baxando o escribiendo'l SO a la tarxeta SD
@@ -1527,7 +1543,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1537,500 +1554,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2172,22 +2189,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB escritos (%2 MB/seg)
@@ -2316,37 +2333,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Encaboxar
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_ca.ts b/recovery/translation_ca.ts
index 29a2ac6c..19540cb0 100644
--- a/recovery/translation_ca.ts
+++ b/recovery/translation_ca.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -690,541 +691,541 @@ WARNING: This will erase all data on your SD card
- Setting up SD card
- Error mounting settings partition
- Waiting for SD card (settings partition)
- Mounting settings partition
- Persistent settings partition seems corrupt. Reformat?
- Reformat failed
- SD card might be damaged
- Main Menu
- Archival
- Maintenance
- Please wait while PINN initialises
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- RECOMMENDED
RECOMANAT
- ERROR
- Error: Some OSes are not available:
- Confirm
Confirma
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed with errors.
See debug log for details
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- OS(es) Installed Successfully
- Error
Error
- PINN v%1 - Built: %2 (%3) %4
- HDMI preferred mode
- HDMI safe mode
mode HDMI segur
- composite PAL mode
mode PAL compost
- composite NTSC mode
mode NTSC compost
- Display Mode Changed
- Display mode changed to %1
Would you like to make this setting permanent?
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- No network access
- Wired network access is required for this feature. Please insert a network cable into the network port.
- Error downloading distribution list from Internet:
- Download error
- Error parsing list.json downloaded from server
- Needed
Necessaris
- Available
Disponibles
- Error downloading meta file
- Error writing downloaded file to SD card. SD card or file system may be damaged.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1232,37 +1233,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
- Finished downloading %1
@@ -1290,218 +1291,233 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
- Finish writing (sync)
- File '%1' does not exist
El fitxer «%1» no existeix
- Fixed partition offset too low
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
- %1: Creating filesystem (%2)
- %1: Mounting file system
- %1: Error mounting file system
- %1: Downloading and extracting filesystem
- %1: Extracting filesystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
- %1: Creating os_config.json
- %1: Saving display mode to config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
- %1: Error executing partition setup script
- %1: Configuring flavour
- %1: Unmounting FAT partition
- %1: Error unmounting
- %1: Checking firmware update
- Error creating file system
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
- Error downloading or writing OS to SD card
@@ -1525,7 +1541,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1535,500 +1552,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2170,22 +2187,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB escrits (%2 MB/s)
@@ -2314,37 +2331,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Cancel·la
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_de.ts b/recovery/translation_de.ts
index da702903..f702fe51 100644
--- a/recovery/translation_de.ts
+++ b/recovery/translation_de.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Schließe Schreibvorgang ab (sync)
- Cannot backup
Backup kann nicht erstellt werden
- :BTRFS file format
:BTRFS Dateiformat
- %1: Updating partitions.json
%1: partitions.json wird aktualisiert
- %1: Writing image (%2)
%1: Image wird geschrieben (%2)
- %1: Archiving (%2)
%1: Wird archiviert (%2)
- Error writing
Fehler beim Schreiben
- : Disk full?
Speicher voll?
- %1: Checksumming (%2)
- %1: Updating os.json
%1: os.json wird aktualisiert
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ Achtung: Dies löscht alle Ihre Daten auf der SD-Karte
W
- RECOMMENDED
EMPFOHLEN
- Confirm
Bestätigung
- Setting up SD card
Richte SD-Karte ein
- Error mounting settings partition
Fehler beim Einbinden der Einstellungspartition
- Persistent settings partition seems corrupt. Reformat?
Die Einstellungspartition scheint fehlerhaft zu sein. Neu formatieren?
- Reformat failed
Neuformatierung gescheitert
- SD card might be damaged
Die SD-Karte ist möglicherweise beschädigt
- Please wait while PINN initialises
Bitte warten Sie, während PINN startet
- is not available.
Please provide it locally or connect to the internet.
ist nicht verfügbar. Bitte stelle es lokal zur Verfügung oder verbinde dich mit dem Internet
- OS(es) Downloaded Successfully.
Download erfolgreich
- Error
Fehler
- PINN v%1 - Built: %2 (%3) %4
PINN Version %1 - Erstellt: %2 (%3) %4
- Display Mode Changed
Darstellungsmodus geändert
- HDMI preferred mode
HDMI-Modus (normal)
- Waiting for SD card (settings partition)
Warte auf SD-Karte (Einstellungspartition)
- Mounting settings partition
Binde Einstellungspartition ein
- Main Menu
Hauptmenü
- Archival
- Maintenance
- ERROR
FEHLER
- Error: Some OSes are not available:
Fehler einige Betriebssysteme sind nicht verfügbar
- SD card
SD-Karte
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Achtung: inkompatible(s) Betriebssystem(e) gefunden. Die nachfolgenden Betriebssysteme werden von dieser Revision des Raspberry Pi nicht unterstützt und werden möglicherweise nicht korrekt funktionieren oder starten:
- ReInstall OSes
Installiere die Betriebssysteme (neu)
- Warning: No OSes selected or available
Warnung: Keine Betriebssysteme ausgewählt oder verfügbar
- Warning: this will download the selected Operating System(s).
Warnung: Dies lädt die ausgewählten Betriebssysteme herunter.
- The download process will begin shortly.
Der Download beginnt in Kürze
- OS(es) downloaded
Betriebssystem(e) heruntergeladen
- OS(es) Backed up with errors.
See debug log for details
Betriebssystem(e) nicht fehlerfrei gesichtert. Schaue in das Debug-Log
- OS(es) Backed up Successfully.
Betriebssystem(e) erfolgreich gesichtert
- Backup OSes
Sichere die Betriebssysteme
- OS(es) Installed Successfully
OS Installed Successfully
Betriebssystem(e) erfolgreich installiert
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
Neustart in %1 Sekunde(n).
- HDMI safe mode
sicherer HDMI-Modus
- composite PAL mode
Composite-PAL-Modus
- composite NTSC mode
Composite-NTSC-Modus
- Display mode changed to %1
Would you like to make this setting permanent?
Darstellungsmodus geändert zu %1
Wollen Sie diese Einstellung dauerhaft speichern?
- Wiping SD card
SD-Karte wird zurückgesetzt.
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
Warnung: Dies wird dein PINN-Laufwerk in seinen Anfangszustand zurücksetzen. Alle existierenden Dateien, inklusive installierten Betriebssystemen, werden gelöscht
- Drive Wiped!
Laufwerk zurückgesetzt!
- Error downloading distribution list from Internet:
Fehler beim Herunterladen der Distributions-Liste aus dem Internet:
- Download error
Download-Fehler
- Error parsing repolist.json downloaded from server
Fehler beim Verarbeiten von repolist.json vom Server.
- Error downloading meta file:
Fehler beim Download einer Meta-Datei:
- Replace OSes
Ersetze das Betriebssystem/die Betriebssysteme
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
Dieses Backup braucht vielleicht
- MB of backup space, but only
MB Backup-Speicher, aber nur
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
MB sind verfügbar. Dies ist nur eine Einschätzung. Wenn du fortfährst wird das Backup eventuell nicht erfolgreich fertiggestellt.
- WARNING: Backup Space
WARNUNG: Backup-Speicher
- Backup Info
Backup-Info
- Always test your backups before relying on them
Teste deine Backups immer, bevor du dich auf sie verlässt.
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Internetzugriff wird benötigt, um PINN ohne lokalen Images zu benutzen. Bitte lege dein Wi-Fi Netzwerk auf dem nächsten Bildschirm fest.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Internetzugriff per Kabel wird benötigt, um PINN ohne lokalen Images zu benutzen. Bitte stecke ein Netzwerkkabel in den Netzwerkanschluss.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Bist du sicher, dass du das Laufwerk '%1' für die Benutzung mit PINN neu formatieren willst? Alle vorhanden Daten auf dem Laufwerk werden gelöscht!
- This will erase all content on the device '%s'. Are you sure?
Dies löscht alle Daten auf dem Laufwerk '%s'. Bist du sicher?
- Clone SD Card
Klone die SD-Karte
- Yes
Ja
- No
Nein
- Clone Completed
Klonen abgeschlossen
- Clone Completed Successfully
Klonen erfolgreich abgeschlossen
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Fehler beim Einlesen der vom Server geladenen list.json
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Benötigt
- Available
Verfügbar
- Error downloading meta file
Fehler beim Herunterladen der Meta-Datei
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Fehler beim Schreiben der heruntergeladenen Datei auf die SD-Karte. Die SD-Karte oder deren Dateisystem könnte fehlerhaft sein.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Kein Netzwerk gefunden
- Wired network access is required for this feature. Please insert a network cable into the network port.
Für diese Funktion ist eine kabelgebundene Netzwerkverbindung erforderlich. Bitte stecken Sie ein Netzwerkkabel ein.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Schließe Schreibvorgang ab (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Fehler beim Herunterladen oder Extrahieren des TAR-Archivs
- Finished downloading %1
@@ -1283,54 +1284,54 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kann nicht installiert werden. Die Recovery-Partition ist zu groß.
- Operating system cannot require a system partition (1,5)
Betriebssystem kann keine Systempartition benötigen (1,2,5) {1,5)?}
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Unzureichender Speicherplatz. %1 MB benötigt, nur %2 MB verfügbar
- Finish writing (sync)
Schließe Schreibvorgang ab (sync)
- File '%1' does not exist
Datei '%1' existiert nicht
- %1: Writing OS image
Writing image
%1: Schreibe Betriebssystem-Image
- %1: Mounting file system
Mounting file system
%1: Binde Dateisystem ein
- %1: Error mounting file system
Error mounting file system
%1: Fehler beim Einbinden des Dateisystems
- %1: Creating filesystem (%2)
%1: Erstelle Dateisystem (%2)
@@ -1345,177 +1346,192 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kann nicht installiert werden. Wert für RISCOS-Offset fehlt.
- More than one operating system requires partition number %1
Mehr als ein Betriebssystem benötigt Partition Nummer %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Fester Partitionsoffset zu gering
- Writing partition table
Schreibe Partitionstabelle
- Writing boot partition table
- Zero'ing start of each partition
Lösche Beginn jeder Partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Fehler beim Einlesen der bestehenden Partitionstabelle
- Error creating partition table
Fehler beim Erstellen der Partitionstabelle
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Lade Dateisystem herunter und entpacke
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Entpacke Dateisystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Binde FAT-Partition ein
- %1: Creating os_config.json
Creating os_config.json
%1: Erstelle os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Speicher Darstellungsmodus in config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Führe Skript für Partionserstellung aus
- %1: Error executing partition setup script
Error executing partition setup script
%1: Fehler beim Ausführen des Skripts für Partionserstellung
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: Passe BCD-Datei an
- %1: Error unmounting
Error unmounting
%1: Fehler beim Aushängen
- %1: Checking firmware update
- Error creating file system
Fehler beim Erstellen des Dateisystems
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Unbekanntes Kompressionsformat in Dateierweiterung. Erwarte .lzo, .gz, .xz, .bz2 oder .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Fehler beim Herunterladen oder Extrahieren des TAR-Archivs
- Error downloading or writing OS to SD card
Fehler beim Herunterladen oder Schreiben des Betriebssystems auf die SD-Karte
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,499 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2183,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB geschrieben (%2 MB/Sek.)
@@ -2287,37 +2305,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
Authentifiziert, warte auf DHCP-Lease
- Connecting to wifi failed
Verbindungsaufbau zu WLAN fehlgeschlagen
- Connecting to the wifi access point failed. Check your password
Verbindungsaufbau zu WLAN-Access-Point fehlgeschlagen. Bitte Passwort überprüfen
- Cancel
Abbrechen
- Releasing old DHCP lease
Gebe altes DHCP-Lease frei
- Disconnecting
Beende Verbindung
- Connecting
Verbindungsaufbau
diff --git a/recovery/translation_en.ts b/recovery/translation_en.ts
index 1236edc6..43c1c0b4 100644
--- a/recovery/translation_en.ts
+++ b/recovery/translation_en.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -690,541 +691,541 @@ WARNING: This will erase all data on your SD card
- Setting up SD card
- Waiting for SD card (settings partition)
- Mounting settings partition
- Error mounting settings partition
- Persistent settings partition seems corrupt. Reformat?
- Reformat failed
- SD card might be damaged
- Main Menu
- Archival
- Maintenance
- Please wait while PINN initialises
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- has an incompatible number of partitions with
- RECOMMENDED
- ERROR
- Error: Some OSes are not available:
- SD card
- Confirm
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
- Installation complete
- Error
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI preferred mode
- HDMI safe mode
- composite PAL mode
- composite NTSC mode
- Display Mode Changed
- Display mode changed to %1
Would you like to make this setting permanent?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- No network access
- Wired network access is required for this feature. Please insert a network cable into the network port.
- Error downloading distribution list from Internet:
- Download error
- Error parsing repolist.json downloaded from server
- Error parsing list.json downloaded from server
- Needed
- Available
- Error downloading meta file:
- filesize error checking
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error downloading meta file
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Downloaded Successfully.
- OS(es) Installed with errors.
See debug log for details
- PINN v%1 - Built: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Error writing downloaded file to SD card. SD card or file system may be damaged.
- Replace OSes
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Reformat drive?
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
@@ -1232,37 +1233,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
- Finished downloading %1
@@ -1290,218 +1291,233 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Finish writing (sync)
- Error reading existing partition table
- Error creating partition table
- File '%1' does not exist
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
- %1: Creating filesystem (%2)
- %1: Mounting file system
- %1: Error mounting file system
- %1: Downloading and extracting filesystem
- %1: Extracting filesystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
- %1: Creating os_config.json
- %1: Saving display mode to config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
- %1: Error executing partition setup script
- %1: Configuring flavour
- %1: Unmounting FAT partition
- %1: Error unmounting
- %1: Checking firmware update
- Error creating file system
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
- Error downloading or writing OS to SD card
@@ -1525,7 +1541,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1535,500 +1552,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2170,22 +2187,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
@@ -2314,37 +2331,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_es.ts b/recovery/translation_es.ts
index 6f21587f..5533a0ce 100644
--- a/recovery/translation_es.ts
+++ b/recovery/translation_es.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Terminando de escribir (sincronizar)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -134,7 +134,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -694,548 +695,548 @@ ADVERTENCIA: Esto borrará todos los datos de tu tarjeta SD
W
- 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
- Persistent settings partition seems corrupt. Reformat?
La partición Settings es la partición con la configuración de PINN
La partición Settings parece estar corrupta. ¿Volver a formatearla?
- Reformat failed
El formateo ha fallado
- Setting up SD card
Preparando la tarjeta SD
- Waiting for SD card (settings partition)
La partición Settings es la partición con la configuración de PINN
Esperando a la tarjeta SD (partición Settings)
- Mounting settings partition
La partición Settings es la partición con la configuración de PINN
Montando partición Settings (de configuración)
- SD card might be damaged
La tarjeta SD podría estar dañada
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- RECOMMENDED
etiqueta para marcar el sistema recomendado en la lista de SOs
RECOMENDADO
- Confirm
Confirmar
- Please wait while PINN initialises
Espere mientras se inicia PINN
- ERROR
- Error: Some OSes are not available:
- SD card
tarjeta SD
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Advertencia: Detectado(s) sistema(s) operativo(s) incompatible(s). Los siguientes sistemas no están soportados en esta versión de Raspberry Pi y podrían fallar en el arranque o funcionar correctamente:
- is not available.
Please provide it locally or connect to the internet.
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
SO(s) instalado(s) correctamente
- Installation complete
- Error
Error
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Error parsing repolist.json downloaded from server
Error al leer el archivo repolist.json descargado del servidor
- Error downloading meta file:
- filesize error checking
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Es necesario tener acceso a internet para usar PINN sin imágenes locales de los SO. Seleccione su red wifi en la siguiente pantalla.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
... Conecte el cable de red al puerto.
Es necesario tener acceso a internet para usar PINN sin imágenes locales de los SO. Conecte el cable al puerto de red.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
¿Está seguro de que desea volver a formatear la unidad '%1' para usarla con PINN? ¡Se borrarán todos los datos existentes en la unidad!
- This will erase all content on the device '%s'. Are you sure?
Esto borrará todo el contenido del dispositivo '%s' ¿Estás seguro?
- Clone SD Card
Clonar tarjeta SD
- Yes
Si
- No
No
- Clone Completed
Clonación completada
- Clone Completed Successfully
Clonación completada correctamente
- Error downloading update file
Error al descargar archivo de actualización
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
ACTUALIZACIÓN PINN
- A new version of PINN is available
Una nueva versión de PINN está disponible
- Do you want to download this version?
¿Quiere descargar esta versión?
- Downloading Update
Descargando actualización
- Press ESC to cancel
Pulsar Esc para cancelar
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- HDMI preferred mode
Modo HDMI (preferido)
- Main Menu
- Archival
- Maintenance
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Downloaded Successfully.
- OS(es) Installed with errors.
See debug log for details
- PINN v%1 - Built: %2 (%3) %4
- HDMI safe mode
Modo HDMI seguro (safe)
- composite PAL mode
Modo PAL compuesto
- composite NTSC mode
Modo NTSC compuesto
- Display Mode Changed
Modo de Pantalla Cambiado
- Display mode changed to %1
Would you like to make this setting permanent?
El modo de pantalla ha cambiado a %1
¿Te gustaría que este cambio fuera permanente?
- No network access
Sin acceso a la red
- Wired network access is required for this feature. Please insert a network cable into the network port.
Esta función requiere de una conexión por cable a la red. Conecte el cable al puerto de red.
- Error downloading distribution list from Internet:
Error al descargar, de Internet, la lista de distribuciones:
- Download error
Error en la descarga
- Error parsing list.json downloaded from server
Error al leer el archivo list.json descargado del servidor
- Needed
Necesario
- Available
Disponible
- Error downloading meta file
Error al descargar el archivo meta
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Error al escribir archivo descargado a la tarjeta SD. La tarjeta SD o el sistema de archivos podrían estar dañados.
- has an incompatible number of partitions with
- Reformat drive?
¿Reformatear unidad?
@@ -1243,37 +1244,37 @@ Would you like to make this setting permanent?
MultiImageDownloadThread
- Finish writing (sync)
Terminando de escribir (sincronizar)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Error al descargar o extraer el archivo comprimido (tarball)
- Finished downloading %1
@@ -1302,220 +1303,235 @@ Would you like to make this setting permanent?
RISCOS no puede ser instalado. El tamaño de la partición recovery (recuperación) es demasiado grande.
- More than one operating system requires partition number %1
Más de un sistema operativo requiere la partición número %1
- Not enough disk space. Need %1 MB, got %2 MB
No hay espacio suficiente en disco. Necesario %1 MB, disponible %2 MB
- Writing partition table
Escribiendo tabla de particiones
- Fixed partition offset too low
Corregido partición desplazamiento (offset) demasiado bajo
- Operating system cannot require a system partition (1,5)
El sistema operativo no puede requerir una partición de sistema (1,5)
- Operating system cannot claim both primary partitions 2 and 4
El sistema operativo no puede solicitar ambas particiones primarias 2 y 4
- Writing boot partition table
Escribiendo tabla de particiones de arranque
- Zero'ing start of each partition
Borrando el comienzo de cada partición
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Finish writing (sync)
Terminando de escribir (sincronizar)
- Error reading existing partition table
Error al leer tabla de particiones
- Error creating partition table
Error al crear tabla de particiones
- File '%1' does not exist
El archivo '%1' no existe
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
%1: Escribiendo imagen del SO
- %1: Creating filesystem (%2)
%1: Creando sistema de archivos (%2)
- %1: Mounting file system
%1: Montando sistema de archivos
- %1: Error mounting file system
%1: Error al montar sistema de archivos
- %1: Downloading and extracting filesystem
%1: Descargando y extrayendo sistema de archivos
- %1: Extracting filesystem
%1: Extrayendo sistema de archivos
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: Montando partición FAT
- %1: Creating os_config.json
%1: Creando os_config.json
- %1: Saving display mode to config.txt
%1: Guardando modo de pantalla en config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
script de configuración de particiones: partition_setup.sh
%1: Ejecutando script de configuración de particiones
- %1: Error executing partition setup script
script de configuración de particiones: partition_setup.sh
%1: Error al ejecutar script de configuración de particiones
- %1: Configuring flavour
%1: Configurando sabor (flavour)
- %1: Unmounting FAT partition
%1: Desmontando partición FAT
- %1: Error unmounting
%1: Error desmontando
- %1: Checking firmware update
- Error creating file system
Error al crear el sistema de archivos
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Formato de archivo comprimido desconocido. Formatos válidos: .lzo, .gz, .xz, .bz2 o .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Error al descargar o extraer el archivo comprimido (tarball)
- Error downloading or writing OS to SD card
Error al descargar o escribir el SO a la tarjeta SD
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2186,22 +2203,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
Escribiendo %1 MB (%2 MB/seg)
@@ -2330,37 +2347,37 @@ Are you sure?
No hay interfaces wifi disponibles
- Authenticated but still waiting for DHCP lease
Autenticado pero esperando por la concesión DHCP
- Connecting to wifi failed
Error al conectarse a la red wifi
- Connecting to the wifi access point failed. Check your password
No se pudo conectar al wifi. Compruebe la contraseña
- Releasing old DHCP lease
Liberando concesión DHCP antigua
- Cancel
Cancelar
- Disconnecting
Desconectando
- Connecting
Conectando
diff --git a/recovery/translation_eu.ts b/recovery/translation_eu.ts
index 2267000c..e4dbe8d7 100644
--- a/recovery/translation_eu.ts
+++ b/recovery/translation_eu.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Idazten bukatu (sinkronizatu)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -695,542 +696,542 @@ KONTUZ: Honek zure SD txarteleko datu guztiak ezabatuko ditu
W
- Setting up SD card
SD txartela prestatzen
- Error mounting settings partition
Errorea ezarpenen partizioa muntatzean
- Waiting for SD card (settings partition)
SD txartelaren zain (ezarpenak partizioa)
- Mounting settings partition
Ezarpenak partizioa muntatzen
- Persistent settings partition seems corrupt. Reformat?
Ezarpen iraunkorren partizioa hondatuta dagoela dirudi. Berriz formateatu?
- Reformat failed
Berriz formateatzeak huts egin du
- SD card might be damaged
SD txartela hondatuta egon daiteke
- Main Menu
- Archival
- Maintenance
- Please wait while PINN initialises
Mesedez itxaron PINN hasieratu arte
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- RECOMMENDED
GOMENDATUA
- ERROR
- Error: Some OSes are not available:
- Confirm
Berretsi
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed with errors.
See debug log for details
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Sareko sarbidea behar da PINN irudi lokalik gabe erabiltzeko. Hautatu zure wifi sarea hurrengo pantailan.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Haridun sareko sarbidea behar da PINN irudi lokalik gabe erabiltzeko. Txertatu sareko kable bat sareko atakan.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Ziur zaude '%1' unitatea PINNekin erabiltzeko birformateatu nahi duzula? Unitateko datu guztiak ezabatuko dira!
- This will erase all content on the device '%s'. Are you sure?
Honek '%s' gailuko eduki guztiak ezabatuko ditu. Ziur zaude?
- Clone SD Card
Klonatu SD txartela
- Yes
Bai
- No
Ez
- Clone Completed
Klonazio burututa
- Clone Completed Successfully
Klonazioa behar bezala burutu da
- Error downloading update file
Errorea eguneraketa fitxategia deskargatzean
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN EGUNERAKETA
- A new version of PINN is available
PINNen bertsio berri bat eskuragarri dago
- Do you want to download this version?
Bertsio hau deskargatu nahi duzu?
- Downloading Update
Eguneraketa deskargatzen
- Press ESC to cancel
Sakatu ESC ezeztatzeko
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- SD card
SD txartela
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Kontuz: sistema eragile bateraezina(k) detektatu d(ir)a. Ondorengo SEek ez dute euskarririk Raspberry Piren bertsio honetan eta baliteke ez abiaraztea edo gaizki funtzionatzea:
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- OS(es) Installed Successfully
SEa(k) behar bezala instalatu dira
- Error
Errorea
- PINN v%1 - Built: %2 (%3) %4
- HDMI preferred mode
HDMI modu hobetsia
- HDMI safe mode
HDMI modu segurua
- composite PAL mode
PAL konposatu modua
- composite NTSC mode
NTSC konposatu modua
- Display Mode Changed
Bistaratze-modua aldatuta
- Display mode changed to %1
Would you like to make this setting permanent?
Bistaratze modua %1(e)ra aldatu da
Ezarpen hau iraunkortu nahi duzu?
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- No network access
Sareko sarbiderik ez
- Wired network access is required for this feature. Please insert a network cable into the network port.
Haridun sareko sarbidea behar da ezaugarri honentzat. Mesedez sartu sareko kable bat sareko atakan.
- Error downloading distribution list from Internet:
Errorea banaketa zerrenda Internetetik deskargatzean:
- Download error
Errorea deskargatzean
- Error parsing list.json downloaded from server
Errorea zerbitzaritik deskargatutako list.json fitxategia analizatzean
- Needed
Behar dena
- Available
Erabilgarri dagoena
- Error downloading meta file
Errorea meta fitxategia deskargatzean
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Errorea deskargatutako fitxategia SD txartelean idaztean. SD txartela edo fitxategi-sistema hondatuta egon daitezke.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Unitatea birformateatu?
@@ -1238,37 +1239,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Idazten bukatu (sinkronizatu)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Errorea tar fitxategia deskargatu edo erauztean
- Finished downloading %1
@@ -1298,218 +1299,233 @@ Booting this drive again will re-instate PINN's partition structure.Ezin da RISCOS instalatu. Berreskuratze-partizio handiegia.
- More than one operating system requires partition number %1
Sistema eragile batek baino gehiagok behar dute %1 zenbakidun partizioa
- Operating system cannot require a system partition (1,5)
Sistema eragileak ezin du sistemaren partizioa eskatu (1,5)
- Operating system cannot claim both primary partitions 2 and 4
Sistema eragileak ezin ditu 2 eta 4 partizio primarioak eskatu
- Not enough disk space. Need %1 MB, got %2 MB
Ez dago nahikoa leku diskoan. %1 MB behar dira, %2 MB daude
- Finish writing (sync)
Idazten bukatu (sinkronizatu)
- File '%1' does not exist
'%1' fitxategia ez da existitzen
- Fixed partition offset too low
Partizio finkoaren desplazamendua baxuegia da
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Writing partition table
Partizio-taula idazten
- Writing boot partition table
Abioko partizio-taula idazten
- Zero'ing start of each partition
Partizio bakoitzaren hasiera zerotzen
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Errorea lehendik dagoen partizio-taula irakurtzean
- Error creating partition table
Errorea partizio-taula sortzean
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
%1: SE irudia idazten
- %1: Creating filesystem (%2)
%1: Fitxategi-sistema sortzen (%2)
- %1: Mounting file system
%1: Fitxategi-sistema muntatzen
- %1: Error mounting file system
%1: Errorea fitxategi-sistema muntatzean
- %1: Downloading and extracting filesystem
%1: Fitxategi-sistema deskargatu eta erauzten
- %1: Extracting filesystem
%1: Fitxategi-sistema erauzten
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: FAT partizioa muntatzen
- %1: Creating os_config.json
%1: os_config.json sortzen
- %1: Saving display mode to config.txt
%1: Bistaratze-modua config.txt-n gordetzen
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
%1: Partizioa prestatzeko script-a exekutatzen
- %1: Error executing partition setup script
%1: Errorea partizioa prestatzeko script-a exekutatzean
- %1: Configuring flavour
%1: Zaporea konfiguratzen
- %1: Unmounting FAT partition
%1: FAT partizioa desmuntatzen
- %1: Error unmounting
%1: Errorea desmuntatzean
- %1: Checking firmware update
- Error creating file system
Errorea fitxategi-sistema sortzean
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Konpresio-formatuaren fitxategi-luzapen ezezaguna. .lzo, .gz, .xz, .bz2 edo .zip espero zen
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Errorea tar fitxategia deskargatu edo erauztean
- Error downloading or writing OS to SD card
Errorea SEa SD txartelera deskargatu edo idaztean
@@ -1533,7 +1549,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1543,500 +1560,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2178,22 +2195,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB idatzita (%2 MB/s)
@@ -2322,37 +2339,37 @@ Are you sure?
Wifi interfazerik ez erabilgarri
- Authenticated but still waiting for DHCP lease
Autentifikatuta baina DHCP lortzeko zain
- Connecting to wifi failed
Wifi-ra konektatzeak huts egin du
- Connecting to the wifi access point failed. Check your password
Wifi sarbide-puntura konektatzeak huts egin du. Egiaztatu zure pasahitza
- Cancel
Utzi
- Releasing old DHCP lease
DHCP zaharra uzten
- Disconnecting
Deskonektatzen
- Connecting
Konektatzen
diff --git a/recovery/translation_fi.ts b/recovery/translation_fi.ts
index 8e592567..1b5112de 100644
--- a/recovery/translation_fi.ts
+++ b/recovery/translation_fi.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Viimeistellään kirjoitusta (synkronointi)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -690,542 +691,542 @@ WARNING: This will erase all data on your SD card
- Setting up SD card
Valmistellaan SD muistikorttia
- RECOMMENDED
SUOSITELTU
- Confirm
Vahvista
- Error mounting settings partition
- Persistent settings partition seems corrupt. Reformat?
- Reformat failed
- SD card might be damaged
- Please wait while PINN initialises
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Error
Virhe
- Display Mode Changed
- HDMI preferred mode
- Waiting for SD card (settings partition)
- Mounting settings partition
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
- composite PAL mode
- composite NTSC mode
- Display mode changed to %1
Would you like to make this setting permanent?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- PINN v%1 - Built: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
- Available
- Error downloading meta file
- Error writing downloaded file to SD card. SD card or file system may be damaged.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Ei verkkoyhteyttä
- Wired network access is required for this feature. Please insert a network cable into the network port.
Tämä ominausuus tarvitsee langallisen verkkoyhteyden toimiakseen. Liitä verkkokaapeli verkko porttiin.
@@ -1233,37 +1234,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Viimeistellään kirjoitusta (synkronointi)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
- Finished downloading %1
@@ -1281,54 +1282,54 @@ Booting this drive again will re-instate PINN's partition structure.
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
- Finish writing (sync)
Viimeistellään kirjoitusta (synkronointi)
- File '%1' does not exist
- %1: Writing OS image
Writing image
- %1: Mounting file system
Mounting file system
- %1: Error mounting file system
Error mounting file system
- %1: Creating filesystem (%2)
@@ -1343,177 +1344,192 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
- %1: Extracting filesystem
%1 Extracting filesystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
- %1: Creating os_config.json
Creating os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
- %1: Error executing partition setup script
Error executing partition setup script
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
- %1: Error unmounting
Error unmounting
- %1: Checking firmware update
- Error creating file system
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
- Error downloading or writing OS to SD card
@@ -1537,7 +1553,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1547,500 +1564,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2182,22 +2199,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 Mt kirjoitettuna (%2 Mt/s)
@@ -2286,37 +2303,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Peruuta
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_fr.ts b/recovery/translation_fr.ts
index 202bb947..8ead9321 100644
--- a/recovery/translation_fr.ts
+++ b/recovery/translation_fr.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
écriture terminée (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ WARNING: This will erase all data on your SD card
W
- Setting up SD card
Paramétrage de la carte SD
- RECOMMENDED
RECOMMANDé
- Confirm
Confirmer
- Error mounting settings partition
Erreur pendant le montage de la partition de réglages
- Persistent settings partition seems corrupt. Reformat?
La partition de réglages persistante semble être corrompue. Reformater?
- Reformat failed
Le reformatage a échoué
- SD card might be damaged
La carte SD est potentiellement endommagée
- Please wait while PINN initialises
Veuillez patientez pendant que PINN s'initialise
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Error
Erreur
- Display Mode Changed
Mode d'affichage modifié
- HDMI preferred mode
Mode HDMI preferré
- Waiting for SD card (settings partition)
En attente de la carte SD (partition de réglages)
- Mounting settings partition
Montage de la partition de réglages
- Main Menu
Menu Principal
- Archival
- Maintenance
Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
Carte SD
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Attention: OS incompatible détecté. Les OS(es) suivant ne sont pas supportés sur cette version du raspberry pi et peuvent potentiellement ne pas démarrer ou fonctionner incorrectement
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
Attention: l'(es) OS sélectionné(s) sera(ont) téléchargé(s)
- The download process will begin shortly.
Le téléchargement va rapidement commencer
- OS(es) downloaded
OS(es) téléchargés
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
OS installé avec succès
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
Mode HDMI sans échec
- composite PAL mode
Mode PAL composite
- composite NTSC mode
Mode NTSC composite
- Display mode changed to %1
Would you like to make this setting permanent?
Mode d'affichage changé en %1
Voudriez-vous faire ceci de façon permanente ?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
Erreur lors du téléchargement des listes de distribution par Internet
- Download error
Erreur durant le téléchargement
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Un accès au réseau est nécessaire pour utiliser PINN sans images locales. Merci de sélectionner votre réseau wifi dans le prochain écran
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
Tout le contenu du lecteur '%s' seront effacées. Etes-vous sûrs?
- Clone SD Card
Cloner la carte SD
- Yes
Oui
- No
Non
- Clone Completed
Clonage terminé
- Clone Completed Successfully
Clonage terminé avec succès
- Error downloading update file
Erreur lors du téléchargement du fichier de mise à jour
- PINN Update Check
Vérification mise à jour de PINN
- Error contacting update server
Erreur lors de la connexion au serveur de mise à jour
- No updates available
Pas de mise à jour disponible
- PINN UPDATE
MISE à JOUR DE PINN
- A new version of PINN is available
Une nouvelle version de PINN est disponible
- Do you want to download this version?
Voulez-vous télécharger cette version?
- Downloading Update
Téléchargement de la mise à jour
- Press ESC to cancel
Appuyez sur Echap pour annuler
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Erreur durant l'analyse du fichier list.json téléchargé
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- PINN v%1 - Built: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Requis
- Available
Disponible
- Error downloading meta file
Erreur pendant le téléchargement des meta fichiers
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Erreur lors de l'écriture des fichiers téléchargés. La carte SD ou le système de fichiers sont peut-être endommagés.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Pas d'accés réseau
- Wired network access is required for this feature. Please insert a network cable into the network port.
Connexion filaire requise pour cette fonctionnalitée. Merci d'insérer un cable réseau dans le port réseau.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
écriture terminée (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Erreur durant le téléchargement ou l'extraction du tarball
- Finished downloading %1
Téléchargement de %1 terminé
@@ -1283,54 +1284,54 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS ne peut être installé. La taille de la partition de récupération semble trop importante.
- Operating system cannot require a system partition (1,5)
L'OS ne peut demander une partition système (1,2,5) {1,5)?}
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Pas assez d'espace disque. %1 MB requis, %2 MB disponibles
- Finish writing (sync)
écriture terminée (sync)
- File '%1' does not exist
Le fichier '%1' n'existe pas
- %1: Writing OS image
Writing image
%1: Ecriture de l'image de l'OS
- %1: Mounting file system
Mounting file system
%1: Montage du système de fichiers
- %1: Error mounting file system
Error mounting file system
%1: Erreur pendant le montage du système de fichiers
- %1: Creating filesystem (%2)
%1: Création du système de fichiers (%2)
@@ -1345,177 +1346,192 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS ne peut être installé. Les valeurs offset de RISCOS sont manquantes.
- More than one operating system requires partition number %1
Plus d'un OS demandent la partition %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Offset de la partition corrigé. (Trop faible)
- Writing partition table
Ecriture de la table de partition
- Writing boot partition table
écriture de la table de partition de démarrage
- Zero'ing start of each partition
Réinitialisation du début de chaque partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Erreur pendant la lecture de la table de partition existante
- Error creating partition table
Erreur pendant la création de la table de partition
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Téléchargement et extraction du système de fichier
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Extraction du système de fichiers
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Montage de la partition FAT
- %1: Creating os_config.json
Creating os_config.json
%1: Création de os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Sauvegarde du mode d'affichage dans config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Lancement du script d'installation de partition
- %1: Error executing partition setup script
Error executing partition setup script
%1: Erreur d'exécution du script d'installation de partition
- %1: Configuring flavour
- %1: Unmounting FAT partition
Unmounting FAT partition
%1: Démontage de la partition FAT
- %1: Error unmounting
Error unmounting
%1: Erreur pendant le démontage
- %1: Checking firmware update
- Error creating file system
Erreur pendant la création du système de fichiers
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Format de compression inconnue. Extension .lzo, .gz, .xz, .bz2 or .zip attendu
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Erreur durant le téléchargement ou l'extraction du tarball
- Error downloading or writing OS to SD card
Erreur durant le téléchargement ou l'écriture de l'OS sur la carte SD
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB écrit (%2 MB/sec)
@@ -2288,37 +2305,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
Authentifié mais toujours en attente du bail DHCP
- Connecting to wifi failed
La connexion Wifi a échoué
- Connecting to the wifi access point failed. Check your password
La connexion au réseau wifi a échoué. Vérifiez votre mot de passe.
- Cancel
Annuler
- Releasing old DHCP lease
Largage des anciens baux DHCP
- Disconnecting
Déconnexion
- Connecting
Connexion en cours
diff --git a/recovery/translation_hu.ts b/recovery/translation_hu.ts
index 3d961a91..f95232a6 100644
--- a/recovery/translation_hu.ts
+++ b/recovery/translation_hu.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Írás befejezése (szink.)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ FIGYELEM: ez letörli az SD kártyát lévő összes adatot
- RECOMMENDED
AJÁNLOTT
- Confirm
Megerősítés
- Setting up SD card
SD kártya összeállítása
- Error mounting settings partition
Nem sikerült a beállítások partíció felcsatolása
- Persistent settings partition seems corrupt. Reformat?
Az állandó beállítások partíció hibásnak tűnik. Megformázzam?
- Reformat failed
Formázás sikertelen
- SD card might be damaged
Lehet, hogy az SD kártya meg van sérülve
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Hiba
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Megjelenítési mód megváltoztatva
- HDMI preferred mode
Előnyben részesített HDMI mód
- Waiting for SD card (settings partition)
- Mounting settings partition
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
OS(-ek) sikeresen telepítve
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
Biztonságos HDMI mód
- composite PAL mode
kompozit PAL mód
- composite NTSC mode
kompozit NTSC mód
- Display mode changed to %1
Would you like to make this setting permanent?
Megjelenítési mód megváltoztatva erre: %1
El szeretnéd menteni ezt a beállítást?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
Letöltési hiba
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Nem sikerült a szerverről letöltött list.json feldolgozása
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Szükséges
- Available
Elérhető
- Error downloading meta file
Nem sikerült a metafájl letöltése
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Nem sikerült a letöltött fájl SD kártyára történő kiírása. Az SD kártya vagy a fájlrendszer sérült lehet.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Nincs hálózati hozzáférés
- Wired network access is required for this feature. Please insert a network cable into the network port.
Vezetékes hálózati hozzáférés szükséges ehhez a funkcióhoz. Kérlek, hogy csatlakoztasd a Pi-t az internethez.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Írás befejezése (szink.)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Nem sikerült a tömörített fájl letöltése vagy kibontása
- Finished downloading %1
@@ -1283,54 +1284,54 @@ Booting this drive again will re-instate PINN's partition structure.A RISCOS nem telepíthető. A recovery partíció mérete túl nagy.
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Nincs elég szabad hely. %1 MB szükséges, és csak %2 MB van
- Finish writing (sync)
Írás befejezése (szink.)
- File '%1' does not exist
'%1' fájl nem létezik
- %1: Writing OS image
Writing image
%1: OS lemezképfájl kiírása
- %1: Mounting file system
Mounting file system
%1: Fájlrendszer felcsatolása
- %1: Error mounting file system
Error mounting file system
%1: Nem sikerült a fájlrendszer felcsatolása
- %1: Creating filesystem (%2)
%1: Fájlrendszer létrehozása (%2)
@@ -1345,177 +1346,192 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: A fájlrendszer letöltése és kibontása
- %1: Extracting filesystem
%1 Extracting filesystem
%1: A fájlrendszer kibontása
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: FAT partíció felcsatolása
- %1: Creating os_config.json
Creating os_config.json
%1: os_config.json létrehozása
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Megjelenítési mód elmentése a config.txt fájlba
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Partícióbeállító parancsfájl futtatása
- %1: Error executing partition setup script
Error executing partition setup script
%1: Hiba történt a partícióbeállító parancsfájl futtatása közben
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: FAT partíció lecsatolása
- %1: Error unmounting
Error unmounting
%1: Nem sikerült a lecsatolás
- %1: Checking firmware update
- Error creating file system
Nem sikerült a fájlrendszer létrehozása
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Ismeretlen tömörítettfájl-kiterjesztés. Elfogadottak: .lzo, .gz, .xz, .bz2 vagy .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Nem sikerült a tömörített fájl letöltése vagy kibontása
- Error downloading or writing OS to SD card
Nem sikerült az OS letöltése vagy kiírása az SD kártyára
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB lett eddig kiírva (%2 MB/mp)
@@ -2288,37 +2305,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Mégse
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_it.ts b/recovery/translation_it.ts
index 277fbeb3..334e3ae8 100644
--- a/recovery/translation_it.ts
+++ b/recovery/translation_it.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Completamento scrittura (sync)
- Cannot backup
Backup non possibile
- :BTRFS file format
: formato file BRTRFS
- %1: Updating partitions.json
%1 : aggiornamento partitions.json
- %1: Writing image (%2)
%1 : scrittura immagine (%2)
- %1: Archiving (%2)
%1 : archiviazione (%2)
- Error writing
Errore scrittura
- : Disk full?
: disco pieno?
- %1: Checksumming (%2)
%1: creazione checksum (%2)
- %1: Updating os.json
%1: aggiornamento os.json
@@ -133,8 +133,9 @@
Edit Options
- Modifica opzioni
+ &Edit Options
+ Edit Options
+ Modifica opzioni
W
- Setting up SD card
Impostazione scheda SD
- RECOMMENDED
RACCOMANDATO
- Confirm
Conferma
- Error mounting settings partition
Errore montaggio partizione di sistema
- Persistent settings partition seems corrupt. Reformat?
La partizione delle impostazioni permanenti sembra corrotta. Vuoi riformattarla?
- Reformat failed
Riformattazione fallita
- SD card might be damaged
La scheda SD potrebbe essere danneggiata
- Please wait while PINN initialises
Attendi l'inizializzazione di PINN
- install
installa
- reinstall
reinstalla
- replace
sostituisci
- USB drive
Unità USB
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
Attenzioen: questo %1 i sistemi operativi selezionati in %2.
Tutti i dati esistenti in %3 verranno eliminati.
- The %1 process will begin shortly.
Il processo '%1' partirà a breve.
- OS(es) Downloaded with errors.
See debug log for details
SO scaricati con errori.
Vedi registro debug per i dettagli.
- OS(es) Installed with errors.
See debug log for details
SO installati con errori.
Vedi registro debug per i dettagli.
- Error
Errore
- Display Mode Changed
Modo visualizzazione modificato
- HDMI preferred mode
Modo HDMI preferenziale
- Waiting for SD card (settings partition)
Attesa scheda SD (partizione impostazioni)
- Mounting settings partition
Montaggio partizione impostazioni
- Main Menu
Menu principale
- Archival
Archivio
- Maintenance
Manutenzione
- ERROR
ERRORE
- Error: Some OSes are not available:
Errore. Alcuni SO non sono disponibili:
- SD card
Scheda SD
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Attenzione: rilevati sistema operativi non compatibili. I seguenti SO non sono supportati in questa revisione di Raspberry Pi e potrebbero fallire l'avvio o non funzionare correttamente:
- ReInstall OSes
Reinstalla SO
- Warning: No OSes selected or available
Attenzione: nessun S.O. selezionato o disponibile
- Warning: this will download the selected Operating System(s).
Attenzione: verranno scaricati i sistemi operativi selezionati.
- The download process will begin shortly.
Il download inizierà a breve.
- OS(es) downloaded
SO scaricati
- OS(es) Backed up with errors.
See debug log for details
Errori backup SO.
Per i dettagli vedi registro debug
- OS(es) Backed up Successfully.
Backup SO completato.
- Backup OSes
Backup SO
- OS(es) Installed Successfully
OS Installed Successfully
SO installato correttamente
- Installation complete
Installazione completata
- Abort
Interrompi
- Discard
Scarta
- Retry
Riprova
- Keep
Mantieni
- Reboot in %1 secs
Riavvio tra %1 secondi
- HDMI safe mode
Modo HDMI sicuro
- composite PAL mode
Modo PAL composito
- composite NTSC mode
Modo NTSC composito
- Display mode changed to %1
Would you like to make this setting permanent?
Modo visualizzazione modificato in %1.
Vuoi rendere questa impostazione permanente?
- Wiping SD card
Azzeramento scheda SD
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
Attenzione: questo ripristinerà l'unità PINN al suo stato iniziale. Tutti i dati esistenti nell'unità, eccetto PINN, verranno sovrascritti incluso qualsiasi sistema operativo installato.
- Drive Wiped!
Unità azzerata!
- Error downloading distribution list from Internet:
Errore download lista distribuzione da internet:
- Download error
Errore download
- Error parsing repolist.json downloaded from server
Errore analisi repolist.json scaricato dal server
- Error downloading meta file:
Errore download file meta:
- Replace OSes
Sostiuisci SO
- Resume partial downloads?
Vuoi riprendere i download parziali?
- Normally select NO, unless your last download was not successful, in which case select YES
Normalmente seleziona NO, a meno che l'ultimo download non è stato completato, in questo caso seleziona SI.
- This backup may require
Questo backup richiede
- MB of backup space, but only
MB come spazio backup, ma solo
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -1035,161 +1036,161 @@ Se continui, il backup potrebbe non essere completato correttamente.
Vuoi continuare?
- WARNING: Backup Space
ATTENZIONE: spazio backup
- Backup Info
Info backup
- Always test your backups before relying on them
Prova semrpe i backup prima di usarli
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Per usare PINN senza immagini locali è richiesto l'accesso alla rete. Seleziona nella finestra successiva la rete Wi-Fi.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Per usare PINN senza immagini locali è richiesto l'accesso alla rete cablata. Inserisci un cavo di rete nella porta ethernet.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Sei sicuro di voler riformattare l'unità '%1' per l'uso con PINN? Tutti i dati esistenti nell'unità verranno eliminati!
- This will erase all content on the device '%s'. Are you sure?
Questo cancellerà tutto il contenuto del dispositivo '%s'. Sei sicuro di voler continuare?
- Clone SD Card
Clona scheda SD
- Yes
Sì
- No
No
- Clone Completed
Clonazione completata
- Clone Completed Successfully
Clonazione completata correttamente
- Error downloading update file
Errore download file aggiornamento
- PINN Update Check
Verifica aggiornamenti PINN
- Error contacting update server
Errore di connesisone al server aggiornamenti
- No updates available
Il software PINN è aggiornato
- PINN UPDATE
AGGIORNAMENTO PINN
- A new version of PINN is available
È disponibile una nuova versione di PINN
- Do you want to download this version?
Vuoi scaricare questa versione?
- Downloading Update
Download aggiornamento
- Press ESC to cancel
Premi ESC per annullare
- Error: No OSes selected
(Do not choose RISC OS or PINN)
Errore: nessun S.O. selezionato
(non scegliere OS RISC o PINN)
- Warning: No OSes selected
Attenzione: nessun S.O. selezionato
- Warning: this will backup the selected Operating System(s).
Attenzione: verrà effettuato il backup dei sistemi operativi selezionati.
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
Attenzione: rilevati sistemi operativi non supportati.
PINN attualmente non può efefttuare il backup dei seguenti SO:
- Error parsing list.json downloaded from server
Errore analisi file list.json scaricato dal server
- is not available.
Please provide it locally or connect to the internet.
non è disponibile.
Copialo localmente o collegati ad internet.
- OS(es) Downloaded Successfully.
Download OS completato.
- PINN v%1 - Built: %2 (%3) %4
PINN v%1 - Build: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
@@ -1198,52 +1199,52 @@ Installazione e download non saranno più disponibili fino a che l'unità n
Riavviando l'unità verrà re-installata la struttura di PINN.
- Needed
Necessario
- Available
Disponibile
- Error downloading meta file
Errore download file meta
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Errore scrittura su SD del file scaricato. La scheda SD o il file system potrebbero essere danneggiati.
- filesize error checking
Errore verifica dimensione file
- has an incompatible number of partitions with
ha un numero incompatibile di partizioni con
- Reformat drive?
Riformattare l'unità?
- No network access
Nessun accesso alla rete
- Wired network access is required for this feature. Please insert a network cable into the network port.
Per questa funzione è richiesto l'accesso alla rete cablata. Inserisci un cavo di rete nella porta ethernet.
@@ -1251,37 +1252,37 @@ Riavviando l'unità verrà re-installata la struttura di PINN.
MultiImageDownloadThread
- Finish writing (sync)
Completamento scrittura (sync)
- File '%1' does not need downloading
Il file '%1' non richiede il download
- Downloading %1:%2
Download %1:%2
- Checking %1:%2
Verifica %1:%2
- Error in checksum
Errore nella checksum
- Error downloading or extracting tarball
Errore download od estrazione tarball
- Finished downloading %1
Download di %1 completato
@@ -1299,54 +1300,54 @@ Riavviando l'unità verrà re-installata la struttura di PINN.RISCOS non può essere installato. Dimensione partizione recovery troppo grande.
- Operating system cannot require a system partition (1,5)
Il sistema operativo non può richiedere la partizione sistema {1,5)
- Operating system cannot claim both primary partitions 2 and 4
Il sistema operativo non può usare entrambe le partizioni primarie 2 e 4
- Not enough disk space. Need %1 MB, got %2 MB
Spazio disco insufficiente. Necessari %1 MB, disponibili %2 MB
- Finish writing (sync)
Completamento scrittura (sync)
- File '%1' does not exist
Il file '%1' non esiste
- %1: Writing OS image
Writing image
%1: scrittura immagine SO
- %1: Mounting file system
Mounting file system
%1: montaggio file system
- %1: Error mounting file system
Error mounting file system
%1: errore montaggio file system
- %1: Creating filesystem (%2)
%1: creazione file system (%2)
@@ -1361,178 +1362,193 @@ Riavviando l'unità verrà re-installata la struttura di PINN.RISCOS non può essere installato. Manca il valore offset RISCOS.
- More than one operating system requires partition number %1
Più di un sistema operativo richiede la partizione %1
- Cannot boot partitions > 62. Reduce the number of OSes
Impossibile avviare partizione > 62. Riduci il numero dei SO
- Cannot boot partitions > #62. Reduce the number of OSes
Impossibile avviare partizione >#62. Riduci il numero dei SO
- Fixed partition offset too low
Offset partizione fissa troppo basso
- Writing partition table
Scrittura tabella partizioni
- Writing boot partition table
Scrittura tabella partizione boot
- Zero'ing start of each partition
Inizializzazione di ogni partizione
- .
Partition not big enough for new image.
.
Partizione non abbastanza grande per la nuova immagine.
- Cannot Reinstall/Replace
Impossibile reinstallare/sostituire
- Operation cancelled by user
Operazione annullata dall'utente
- Error reading existing partition table
Errore durante lettura tabella partizione esistente
- Error creating partition table
Errore durante creazione tabella partizioni
- OS: '%1' needs a partition label of '%2' which is not available
SO: '%1' richiede un'etichetta partizione '%2' che non è disponibile
- %1: Downloading and extracting filesystem
%1: download ed estrazione file system
- %1: Extracting filesystem
%1 Extracting filesystem
%1: estrazione file system
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: montaggio partizione FAT
- %1: Creating os_config.json
Creating os_config.json
%1: creazione file os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: salvataggio modo visualizzazione in file config.txt
- Error in checksum for partition_setup.sh
Errore nella checksum per partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: esecuzione script impostazione partizione
- %1: Error executing partition setup script
Error executing partition setup script
%1: errore esecuzione script installazione partizione
- %1: Configuring flavour
%1: configurazione impostazioni
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: smontaggio partizione FAT
- %1: Error unmounting
Error unmounting
%1: errore smontaggio
- %1: Checking firmware update
%1: controllo aggiornamenti firmware
- Error creating file system
Errore creazione file system
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Estensione file tipo compressione sconosciuta. Attesi: .lzo, .gz, .xz, .bz2,o .zip
- An incorrect file checksum has been detected in %1
È stato rilevata una checksum file errata in %1
- Checksum error
Errore checksum
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Errore download od estrazione tarball
- Error downloading or writing OS to SD card
Errore download o scrittura su SD del SO
@@ -1556,8 +1572,9 @@ Partizione non abbastanza grande per la nuova immagine.
noobsconfig
- noobsconfig
+ noobs&config
+ noobsconfig
+ noobsconfig
reserve=
- reserve=
+ re&serve=
+ reserve=
+ reserve=
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
Specifica un percorso o una URL dove i file di personalizzazione noobconfig sono disponibili (a meno che siano in /os/<distro>/)
- configpath=
- configpath=
-
-
- Amount of space to reserve (MB) on PINN's partition
Quantità di spazio da riservare (in MB) nella partizione PINN
- Selecting this will erase all of your OSes
Selezionando questa opzione verranno eliminati tutti i SO
- runinstaller
- runinstaller
-
-
- Prevents PINN from checking for self updates
Evita che PINN cerchi gli aggiornamenti
- no_update
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
Forza PINN all'aggiornamento automaticato quando viene rilevata una nuova versione
- forceupdatepinn
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
NON aggiorna i firmware di vecchie installazioni di SO
- nofirmware
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
Seleziona tutti i SO in cui si trova il più recente nella scheda SD
- allsd
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
Seleziona tutti i SO in cui si trova il più recente nell'unità USB
- allusb
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
Seleziona tutti i SO in cui si trova il più recente nei repository remoti.
- allnetwork
- allnetwork
-
-
- Ensures all installed OSes are selected again.
Verifica di nuovo tutti i SO installati.
- allinstalled
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
Attende che siano elencati tutti i sistemi operativi presenti nella scheda SD
- waitsd
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
Attende che siano elencati tutti i sistemi operativi presenti nell'unità USB
- waitusb
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
Attende che siano elencati tutti i sistemi operativi presenti nei repository remoti
- waitnetwork
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
Attende che siano elencati tutti i sistemi operativi presenti in tutte le sorgenti
- waitall
- waitall
-
-
- The list of OSes that will be selected at startup
L'elenco dei sistemi operativi che saranno selezionati all'avvio
- Reserve an ADDITIONAL amount of space
Riserva una quantità AGGIUNTIVA di spazio
- +
+
- Automatically reinstalls any selected OSes if newer versions exist
Installa automaticamente tutti i SO selezionati se esistono versioni più recenti
- silentreinstallnewer
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
Consente l'installazione automatica di un singolo o più SO, utile durante installazioni automatiche.
- silentinstall
- silentreinstallnewer
-
-
- select=
- select=
-
-
- Source
Sorgente
- Prevents the default RaspberryPi Foundation repository from being used.
Impedisce l'utilizzo del repository predefinito di RaspberryPi Foundation.
- no_default_source
- nodefaultsource
- no_default_source
-
-
- Prevents OSes stored on local USB memory devices from being used.
Impedisce l'utilizzo di sistemi operativi memorizzati nei dispositivi di memoria USB locali.
- disableusbimages
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
Impedisce l'uso dei sistemi operativi memorizzati nella scheda SD.
- disablesdimages
- disablesdimages
-
-
- 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.
Visualizza tutti i SO installabili disponibili, indipendentemente dal fatto che siano adatti al modello attuale di Pi o meno.
Utile per preparare le schede SD da utilizzare in altri RPi.
- showall
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
Fornisce l'URL di un file repo_list.json che contiene un elenco di URL per altri file os-list_v3.json.
Ciò consente una facile gestione remota dei repository internet.
- repo_list=
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Simile a alt_image_source ma corrisponde al metodo NOOBS di specificare un elenco di respository aggiuntivi come stringa quotata separata da spazio.
- repo=
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
: Fornisce l'URL di un file os_list_v3.json aggiuntivo che indica la posizione di altri sistemi operativi che possono essere scaricati da Internet.
Possono essere usate istanze multiple di questa opzione.
- alt_image_source=
- alt_image_source=
-
-
- Booting
Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
Quando viene usato insieme a forcetrigger, imposta un periodo di timeout massimo in secondi per la visualizzazione del menu di ripristino prima di continuare con la finestra di dialogo di selezione di avvio e di selezionare potenzialmente un SO predefinito per l'avvio.
- remotetimeout=<secs>
- remotetimeout=<sec>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
Forza l'accesso all'interfaccia PINN all'avvio (come se fosse stato premuto il tasto Maiusc).
Questo è molto utile quando si usa una connessione VNC.
- forcetrigger
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
Forza la modalità di recupero da inserire all'avvio se il pin 3 del GPIO sull'header P1 è collegato a GND (pin 25).
- gpiotriggerenable
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
Questa impostazione consente di specificare il timeout della rete in secondi, soprattutto per le reti che impiegano più tempo per stabilirsi.
- networktimeout=<secs>
- networktimeout=<sec>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Impedisce che la pressione dela tasto MAIUSC abiliti la modalità di ripristino all'avvio (potresti avere una tastiera problematica che si attiva erroneamente ogni volta che fai il boot)
- keyboardtriggerenable
- keyboardtriggerenable
-
-
- Interface
Interfaccia
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
Usa una connessione di rete VNC per controllare PINN anziché qualsiasi tastiera, mouse e display collegati localmente.
Quando viene usata, qualsiasi display locale rimarrà vuoto.
-
- vncinstall
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
Usa una connessione di rete VNC per controllare PINN.
Tuttavia, a differenza di vncinstall, qualsiasi tastiera e mouse collegati localmente saranno ancora attivi e il display sarà duplicato sullo schermo locale e nella connessione VNC.
- vncshare
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
Abilita una connessione SSH al rescueshell in PINN.
Non può essere usata per controllare PINN, ma avere una shell è molto utile per eseguire la manutenzione remota in una qualsiasi delle partizioni della scheda SD.
- ssh
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
Questa opzione fa sì che una shell di comando locale venga aperta all'avvio di PINN.
Quando la shell viene chiusa, PINN verrà avviato normalmente.
- rescueshell
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
Impedisce l'avvio in safemode se si dispone di hardware esterno che fa il pullup verso il basso del pin 5.
- disablesafemode
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
Una speciale funzione di avvio per scambiare la priorità delle uscite video DSI e HDMI, consentendo a un sistema operativo di dare priorità a uno schermo HDMI se collegato.
- dsi
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
Impedisce che l'elenco dei sistemi operativi venga raggruppato in categorie.
- no_group
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
Impedisce che il cursore venga visualizzato nella finestra di dialogo di avvio (richiesto per i dispositivi touchscreen)
- no_cursor
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
Fa sì che un file wallpaper.jpg o wallpaper.png personalizzato venga ridimensionato per riempire l'intero desktop
- wallpaper_resize
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
Imposta una delle 4 modalità di visualizzazione: 0 = HDMI preferito, 1 = HDMI sicuro, 2 = PAL 4:3, 3 = NTSC 4:3
- display=
- display=
-
-
- Changes the style of the windows
Modifica lo stile delle finestre
- style=
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
Modifica il timeout predefinito prima che un SO venga avviato senza alcuna selezione.
-
- bootmenutimeout=<secs>
- bootmenutimeout=<sec>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
Per modificare il colore di sfondo per lo schermo e la maggior parte delle finestre, aggiungi background=r,g,b, dove 0,0,0 è il nero e 255,255,255 è il bianco.
Ti suggeriamo di usare valori superiori a 127.
- background=<r,g,b>
- background=<r,g,b>
+ &configpath=
+
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
nessuno
- 0
0
- 1
1
- 2
2
- 3
3
- windows
finestre
- motif
motif
- platinum
platino
@@ -2215,22 +2232,22 @@ Vuoi proseguire?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
Letti %1 MB di %2 MB (%3 MB/sec) - rimangono: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
Scritti %1 MB di %2 MB (%3 MB/sec) - rimangono: %4:%5:%6
- %1 MB read (%2 MB/sec)
Letti %1 MB (%2 MB/sec)
- %1 MB written (%2 MB/sec)
Scritti %1 MB (%2 MB/sec)
@@ -2319,37 +2336,37 @@ Vuoi proseguire?
Nessuna rete Wi-Fi disponibile
- Authenticated but still waiting for DHCP lease
Autentificato ma ancora in attesa del lease DHCP
- Connecting to wifi failed
Connessione alla rete Wi-Fi fallita
- Connecting to the wifi access point failed. Check your password
Connessione all'access point Wi-Fi fallita. Verifica la password
- Cancel
Annulla
- Releasing old DHCP lease
Rilascio vecchio lease DHCP
- Disconnecting
Disconnessione
- Connecting
Connessione
diff --git a/recovery/translation_ja.ts b/recovery/translation_ja.ts
index 7eedc415..667d940d 100644
--- a/recovery/translation_ja.ts
+++ b/recovery/translation_ja.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
書き込み完了(同期)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ WARNING: This will erase all data on your SD card
- RECOMMENDED
推奨
- Confirm
確認
- Setting up SD card
SDカードをセットアップ中
- Error mounting settings partition
設定パーティションのマウントエラー
- Persistent settings partition seems corrupt. Reformat?
設定パーティションは壊れているようです.再フォーマットしますか？
- Reformat failed
再フォーマット失敗
- SD card might be damaged
SDカードが壊れているかもしれません
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
エラー
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
表示モード
- HDMI preferred mode
HDMI 通常モード
- Waiting for SD card (settings partition)
- Mounting settings partition
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
OSのインストールに成功しました
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
HDMI セーフモード
- composite PAL mode
コンポジット PALモード
- composite NTSC mode
コンポジット NTSCモード
- Display mode changed to %1
Would you like to make this setting permanent?
表示モードを %1 に変更しました.
この設定を保持しますか？
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
ダウンロードエラー
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
サーバーからダウンロードしたlist.jsonの読み込みエラー
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
必要な容量
- Available
使用可能な容量
- Error downloading meta file
メタファイルのダウンロードエラー
- Error writing downloaded file to SD card. SD card or file system may be damaged.
ダウンロードしたファイルのSDカード書き込みエラー.SDカードかファイルシステムが壊れているかもしれません.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
ネットワークが接続されていません
- Wired network access is required for this feature. Please insert a network cable into the network port.
この機能には有線ネットワークが必要です.ネットワークケーブルを接続してください.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
書き込み完了(同期)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
tarballのダウンロード中もしくは展開中のエラー
- Finished downloading %1
@@ -1283,54 +1284,54 @@ Booting this drive again will re-instate PINN's partition structure.RIOSOSをインストール出来ません.リカバリーパーティションのサイズが大きすぎます.
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
ディスクスペースが足りません. %1 MB必要ですが, %2 MBしかありません.
- Finish writing (sync)
書き込み完了(同期)
- File '%1' does not exist
ファイル '%1' がありません.
- %1: Writing OS image
Writing image
%1: イメージを書き込み中
- %1: Mounting file system
Mounting file system
%1: ファイルシステムをマウント中
- %1: Error mounting file system
Error mounting file system
%1: ファイルシステムのマウント中にエラーが発生しました
- %1: Creating filesystem (%2)
%1: ファイルシステムを作成中 (%2)
@@ -1345,177 +1346,192 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: ファイルシステムをダウンロード・展開中
- %1: Extracting filesystem
%1 Extracting filesystem
%1: ファイルシステムを展開中
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: FATパーティションをマウント中
- %1: Creating os_config.json
Creating os_config.json
%1: os_config.json を作成中
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: config.txt にディスプレイモードを保存中
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: パーティションのセットアップスクリプトを実行中
- %1: Error executing partition setup script
Error executing partition setup script
%1: パーティションのセットアップスクリプトを実行中にエラーが発生しました
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: FATパーティションをアンマウント中
- %1: Error unmounting
Error unmounting
%1: アンマウント中にエラーが発生しました
- %1: Checking firmware update
- Error creating file system
ファイルシステム作成中のエラー
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
不明な圧縮ファイルフォーマット形式です.対応する形式は .lzo, .gz, .xz, .bz2, .zip のいずれかです
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
tarballのダウンロード中もしくは展開中のエラー
- Error downloading or writing OS to SD card
SDカードにOSをダウンロード中もしくは書き込み中のエラー
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB 書き込み済み (%2 MB/秒)
@@ -2288,37 +2305,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
キャンセル
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_ko.ts b/recovery/translation_ko.ts
index 6d95fada..b2de975e 100644
--- a/recovery/translation_ko.ts
+++ b/recovery/translation_ko.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
(동기화) 기록을 완료합니다.
- Cannot backup
백업할 수 없음
- :BTRFS file format
:BTRFS 파일 형식
- %1: Updating partitions.json
%1: partitions.json 내용을 업데이트하고 있습니다.
- %1: Writing image (%2)
%1: (%2) OS 이미지를 기록하고 있습니다
- %1: Archiving (%2)
%1: (%2) 보관 작업하고 있습니다.
- Error writing
기록 오류
- : Disk full?
: 디스크 용량이 가득 찬 것 같습니다.
- %1: Checksumming (%2)
- %1: Updating os.json
%1: os.json 내용을 업데이트하고 있습니다.
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -686,302 +687,302 @@ WARNING: This will erase all data on your SD card
C
- Setting up SD card
SD 카드 설정
- Waiting for SD card (settings partition)
(설정 파티션) SD 카드를 준비하고 있습니다.
- Mounting settings partition
설정 파티션을 마운트하고 있습니다
- Error mounting settings partition
설정 파티션을 마운트하는 과정에서 오류가 발생하였습니다.
- Persistent settings partition seems corrupt. Reformat?
고정된 설정 파티션이 손상된 것으로 보입니다. 다시 초기화하시겠습니까?
- Reformat failed
다시 초기화할 수 없음
- SD card might be damaged
SD 카드가 손상된 것으로 보입니다.
- Main Menu
메인 메뉴
- Archival
보관된 이미지
- Maintenance
관리 항목
- Please wait while PINN initialises
PINN을 초기화하고 있습니다. 잠시만 기다려 주십시요.
- OS(es) Downloaded Successfully.
선택한 OS를 다운로드하였습니다.
- OS(es) Installed with errors.
See debug log for details
- PINN v%1 - Built: %2 (%3) %4
PINN v%1 - 빌드: %2 (%3) %4
- has an incompatible number of partitions with
은(는) 다음 파티션과 호환되지 않은 파티션 번호를 갖고 있습니다.대상 파티션:
- RECOMMENDED
추천 파티션
- ERROR
오류
- Error: Some OSes are not available:
오류: 일부 OS는 사용할 수 없습니다. 대상 OS:
- SD card
SD 카드
- Confirm
확인
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
경고: 호환되지 않는 운영체제를 발견하였습니다. 이 운영체제는 Raspberry Pi 의 현재 리비전을 지원하지 않으므로 제대로 부팅할 수 없거나 원래 기능을 제대로 이용할 수 없을 수 있습니다. 대상 운영체제:
- is not available.
Please provide it locally or connect to the internet.
은(는) 사용할 수 없습니다.
로컬 이미지를 제공하거나 인터넷에 연결하여 주십시요.
- ReInstall OSes
운영체제 재설치
- Warning: No OSes selected or available
경고: 선택한 운영체제가 없거나 재설치할 수 없습니다.
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- Warning: this will download the selected Operating System(s).
경고: 이 동작은 선택한 운영체제를 다운로드합니다.
- The download process will begin shortly.
곧 다운로드 과정을 시작합니다.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) downloaded
OS 다운로드 완료
- OS(es) Backed up with errors.
See debug log for details
선택한 OS에 대한 백업 과정에 오류가 있었습니다.
자세한 정보는 디버깅 로그를 참조해 주십시요.
- OS(es) Backed up Successfully.
선택한 OS를 백업하였습니다.
- Backup OSes
백업 대상 OS
- OS(es) Installed Successfully
운영체제를 설치하였습니다.
- Installation complete
- Error
오류
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
%1초 내에 재부팅합니다.
- HDMI preferred mode
HDMI 선호 모드
- HDMI safe mode
HDMI 안전 모드
- composite PAL mode
PAL 영상 출력 모드
- composite NTSC mode
NTSC 영상 출력 모드
- Display Mode Changed
디스플레이 모드가 변경되었습니다.
- Display mode changed to %1
Would you like to make this setting permanent?
디스플레이 모드가 %1 로 변경되었습니다.
이 설정을 계속 유지하시겠습니까?
- Wiping SD card
SD 카드 초기화
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
경고: 이 동작은 PINN 드라이브를 초기 상태로 되돌립니다. 이 드라이브에 있는 모든 데이터를 지우고 다시 저장합니다. 이미 설치한 OS도 모두 지워집니다.
- Drive Wiped!
드라이브 초기화 완료
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
@@ -990,106 +991,106 @@ Booting this drive again will re-instate PINN's partition structure.
- No network access
네트워크에 접속할 수 없음
- Wired network access is required for this feature. Please insert a network cable into the network port.
이 기능은 유선 네트워크 연결이 필요합니다. 네트워크 포트에 네트워크 케이블을 삽입하여 주십시요.
- Error downloading distribution list from Internet:
인터넷에서 배포판 목록을 가져오는 과정에서 오류가 발생하였습니다.
- Download error
다운로드 오류
- Error parsing repolist.json downloaded from server
서버에서 가져온 repolist.json의 내용을 분석하는 과정에서 오류가 발생하였습니다.
- Error parsing list.json downloaded from server
서버에서 가져온 list.json의 내용을 분석하는 과정에서 오류가 발생하였습니다.
- Needed
필요함
- Available
가능함
- Error downloading meta file:
메타파일을 가져오는 과정에서 오류가 발생하였습니다. URL:
- Error downloading meta file
메타파일을 가져오는 과정에서 오류가 발생하였습니다.
- Error writing downloaded file to SD card. SD card or file system may be damaged.
다운로드한 파일을 SD 카드에 기록하는 과정에서 오류가 발생하였습니다. SD 카드 또는 파일 시스템이 손상되었는지 확인하여 주십시오.
- filesize error checking
파일 크기 오류를 확인합니다. URL:
- Replace OSes
OS 교체
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
이 백업은
- MB of backup space, but only
MB를 백업 공간으로 이용합니다. 그러나 남은 용량이
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -1098,137 +1099,137 @@ Do you want to continue?
계속하시겠습니까?
- WARNING: Backup Space
경고: 백업 공간
- Backup Info
백업 정보
- Always test your backups before relying on them
이 백업을 신뢰하기 전에 정상 여부를 항상 확인하십시요.
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
로컬 이미지가 없는 PINN은 네트워크 접속이 필요합니다. 다음 화면에서 Wi-Fi 네트워크를 선택해 주십시오.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
로컬에 운영체제 이미지가 없는 PINN을 사용하려면 유선 네트워크 연결이 필요합니다. 네트워크 포트에 네트워크 케이블을 삽입하여 주십시요.
- Reformat drive?
드라이브 초기화 확인
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
'%1' 드라이브를 정말 다시 초기화하시겠습니까? 초기화를 완료하면 이 드라이브 안에 있는 모든 데이터는 완전히 삭제됩니다. 초기화 후 PINN이 이 드라이브를 이용합니다.
- This will erase all content on the device '%s'. Are you sure?
장치 '%s'의 모든 내용이 지워집니다. 정말 진행하시겠습니까?
- Clone SD Card
SD 카드 복제
- Yes
예
- No
아니요
- Clone Completed
복제 완료
- Clone Completed Successfully
복제를 완료하였습니다.
- Error downloading update file
업데이트한 파일을 다운로드 하는 과정에 오류가 발생하였습니다.
- PINN Update Check
PINN 업데이트 확인
- Error contacting update server
업데이트 서버에 연결할 수 없습니다.
- No updates available
새로운 업데이트가 없습니다.
- PINN UPDATE
PINN 업데이트
- A new version of PINN is available
새 버전의 PINN 을 사용할 수 있습니다.
- Do you want to download this version?
이 버전을 다운로드 하시겠습니까?
- Downloading Update
업데이트 다운로드
- Press ESC to cancel
취소하려면 ESC 를 누르십시요.
- Error: No OSes selected
(Do not choose RISC OS or PINN)
경고: 선택한 OS가 없습니다.
(RISC OS 또는 PINN을 선택하지 마십시요.)
- Warning: No OSes selected
경고: 선택한 OS가 없습니다.
- Warning: this will backup the selected Operating System(s).
경고: 이 동작은 선택한 운영체제를 백업합니다.
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
경고: 지원하지 않는 운영체제를 발견하였습니다. PINN은 이 운영체제에 대한 백업을 제대로 생성하지 못할 수 있습니다. 대상 운영체제:
@@ -1236,37 +1237,37 @@ Do you want to continue?
MultiImageDownloadThread
- Finish writing (sync)
(동기화) 기록을 완료하였습니다.
- File '%1' does not need downloading
'%1' 파일은 다운로드할 필요가 없습니다.
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
tarball을 다운로드 및 압축 해제하는 과정에서 오류가 발생하였습니다
- Finished downloading %1
%1을(를) 다운로드 하였습니다.
@@ -1294,220 +1295,235 @@ Do you want to continue?
RISCOS를 설치할 수 없습니다. 복구 파티션의 크기가 너무 큽니다.
- More than one operating system requires partition number %1
하나 이상의 운영체제에 파티션 %1번이 필요합니다
- Operating system cannot require a system partition (1,5)
운영체제가 시스템 파티션 (1,5) 을 요청할 수 없습니다
- Operating system cannot claim both primary partitions 2 and 4
운영체제가 주 파티션 2와 4를 모두 요구할 수는 없습니다
- Not enough disk space. Need %1 MB, got %2 MB
디스크 공간이 부족합니다. 필요한 공간은 %1 MB이며, 남은 공간은 %2 MB입니다.
- Fixed partition offset too low
고정 파티션 오프셋 값이 너무 낮습니다
- Writing partition table
파티션 테이블을 기록하고 있습니다
- Writing boot partition table
부팅 파티션을 기록하고 있습니다
- Zero'ing start of each partition
각 파티션을 초기화 하고 있습니다
- Cannot boot partitions > 62. Reduce the number of OSes
이 파티션으로 부팅 불가 > 62. 운영체제 수를 줄이십시요.
- Cannot boot partitions > #62. Reduce the number of OSes
이 파티션으로 부팅 불가 > #62. 운영체제 수를 줄이십시요.
- .
Partition not big enough for new image.
를 재설치할 수 없습니다.
운영체제 설치를 위한 파티션 크기가 충분히 크지 않습니다.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Finish writing (sync)
(동기화) 기록을 완료합니다.
- Error reading existing partition table
이미 있는 파티션 테이블을 읽는 과정에서 오류가 발생하였습니다
- Error creating partition table
파티션 테이블을 생성하는 과정에서 오류가 발생하였습니다
- File '%1' does not exist
파일 '%1' 이 없습니다.
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Writing OS image
%1: 운영체제 이미지 파일을 기록하고 있습니다.
- %1: Creating filesystem (%2)
%1: (%2) 파일시스템을 만들고 있습니다.
- %1: Mounting file system
%1: 파일 시스템을 마운트하고 있습니다.
- %1: Error mounting file system
%1: 파일 시스템을 마운트하는 과정에서 오류가 발생하였습니다.
- %1: Downloading and extracting filesystem
%1: 파일 시스템을 다운로드 및 압축 해제하고 있습니다.
- %1: Extracting filesystem
%1: 파일 시스템을 추출하고 있습니다.
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: FAT 파티션을 마운트하고 있습니다.
- %1: Creating os_config.json
%1: os_config.json을 만들고 있습니다.
- %1: Saving display mode to config.txt
%1: 디스플레이 모드를 config.txt에 저장하고 있습니다.
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
%1: 파티션 설치 스크립트를 실행하고 있습니다.
- %1: Error executing partition setup script
%1: 파티션 설치 스크립트를 실행하는 과정에서 오류가 발생하였습니다.
- %1: Configuring flavour
flavour 를 구성으로 번역하고 있음. https://developer.android.com/studio/build/build-variants.html?hl=ko#flavor-dimensions
%1: 구성을 설정하고 있습니다.
- %1: Unmounting FAT partition
%1: FAT 파티션을 마운트 해제하고 있습니다.
- %1: Error unmounting
%1: 마운트 해제하는 과정에서 오류가 발생하였습니다.
- %1: Checking firmware update
%1: 펌웨어 업데이트를 확인하고 있습니다.
- Error creating file system
파일 시스템을 만드는 과정에서 오류가 발생하였습니다.
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
압축 파일의 형식을 알아낼 수 없었습니다. .lzo 또는 .gz, .xz, .bz2, .zip 형식을 지원합니다.
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
tarball을 다운로드 및 압축 해제하는 과정에서 오류가 발생하였습니다
- Error downloading or writing OS to SD card
운영체제를 SD 카드에 다운로드 및 기록하는 과정에서 오류가 발생하였습니다
@@ -1531,7 +1547,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1541,500 +1558,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2176,22 +2193,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
%2 MB 중 %1 MB 확인 (%3 MB/초) 남은 시간: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
%2 MB 중 %1 MB 기록 완료 (%3 MB/초) 남은 시간: %4:%5:%6
- %1 MB read (%2 MB/sec)
%1 MB 확인 (%2 MB/초)
- %1 MB written (%2 MB/sec)
%1 MB 기록 완료 (%2 MB/초)
@@ -2320,37 +2337,37 @@ Are you sure?
사용 가능한 Wi-Fi 수신기가 없습니다
- Authenticated but still waiting for DHCP lease
인증 완료 - DHCP에서 임대할 IP를 기다리고 있습니다
- Connecting to wifi failed
Wi-Fi 연결 실패
- Connecting to the wifi access point failed. Check your password
Wi-Fi 액세스 지점에 연결하지 못하였습니다. 입력한 암호를 확인하여 주십시오
- Cancel
취소
- Releasing old DHCP lease
DHCP 에서 임대한 IP를 갱신하고 있습니다
- Disconnecting
연결을 해제하고 있습니다
- Connecting
연결하고 있습니다
diff --git a/recovery/translation_nl.ts b/recovery/translation_nl.ts
index be68c13a..527cb097 100644
--- a/recovery/translation_nl.ts
+++ b/recovery/translation_nl.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Bezig met wegschrijven (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ WAARSCHUWING: Dit verwijdert alle bestaande bestanden op de SD kaartW
- RECOMMENDED
AANBEVOLEN
- Confirm
Bevestigen
- Setting up SD card
SD card voorbereiden
- Error mounting settings partition
Fout bij mounten instellingen partitie
- Persistent settings partition seems corrupt. Reformat?
Instellingen partitie corrupt. Opnieuw formatteren?
- Reformat failed
Formatteren mislukt
- SD card might be damaged
SD kaart kan beschadigd zijn
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Fout
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Resolutie aangepast
- HDMI preferred mode
HDMI preferred mode
- Waiting for SD card (settings partition)
Wachten op SD kaart (settings partitie)
- Mounting settings partition
Mounten van de settings partitie
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
incompatibele OS gedetecteerd, the volgende OS's zijn niet ondersteund in deze versie van Raspberry Pi en kunnen mogelijk niet opstarten of correct functioneren
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
Besturingssysteem successvol geinstalleerd
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
HDMI safe mode
- composite PAL mode
composite PAL mode
- composite NTSC mode
composite NTSC mode
- Display mode changed to %1
Would you like to make this setting permanent?
Resolutie aangepast naar %1
De instelling opslaan?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
Fout bij downloaden
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Fout bij parsen list.json
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Nodig
- Available
Beschikbaar
- Error downloading meta file
Fout bij downloaden meta bestand
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Fout bij wegschrijven gedownload bestand naar SD kaart. SD kaart of bestandssysteem kan beschadigd zijn.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Geen netwerk verbinding
- Wired network access is required for this feature. Please insert a network cable into the network port.
Een bekabelde netwerk verbinding is vereist voor deze functionaliteit. Controleer of de netwerk kabel aangesloten zit.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Bezig met wegschrijven (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Fout bij downloaden of uitpakken tarball
- Finished downloading %1
@@ -1283,54 +1284,54 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kan niet geinstalleerd worden. Recovery partitie te groot.
- Operating system cannot require a system partition (1,5)
OS kan geen systeem partitite nodig hebben (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Niet genoeg schijfruimte. %1 MB nodig, %2 MB beschikbaar
- Finish writing (sync)
Bezig met wegschrijven (sync)
- File '%1' does not exist
Bestand '%1' bestaat niet
- %1: Writing OS image
Writing image
%1: Wegschrijven image
- %1: Mounting file system
Mounting file system
%1: Koppelen van bestandssysteem
- %1: Error mounting file system
Error mounting file system
%1: Fout bij mounten bestandssysteem
- %1: Creating filesystem (%2)
%1: Aanmaken bestandssysteem (%2)
@@ -1345,177 +1346,192 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS Kan niet installeren, RISCOS correctiewaarde missend
- More than one operating system requires partition number %1
Meer dan een OS hebben partitie nummers %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Fixed partitie correctiewaarde te laag
- Writing partition table
Schijven van Partitie tabel
- Writing boot partition table
- Zero'ing start of each partition
Alle begin delen van elke partitie op nul zetten
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Lezen van bestaande partitie
- Error creating partition table
Maken partitie tabel
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Downloaden en uitpakken van bestands systeem
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Bestands systeem uitpakken
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Mounten FAT partitie
- %1: Creating os_config.json
Creating os_config.json
%1: Aanmaken os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Scherm resolutie opslaan in config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Uitvoeren partitie setup script
- %1: Error executing partition setup script
Error executing partition setup script
%1: Fout bij uitvoeren partitie setup script
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: Patchen van het BCD bestand
- %1: Error unmounting
Error unmounting
%1: Fout bij uitwerpen
- %1: Checking firmware update
- Error creating file system
Fout bij aanmaken bestandssysteem
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Onbekend compressie formaat bestands extensie. Verwacht .lzo .gz .xz .bz2 of .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Fout bij downloaden of uitpakken tarball
- Error downloading or writing OS to SD card
Error tijdens het downloaden of schijven van de OS naar de SD kaart
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB weggeschreven (%2 MB/sec)
@@ -2288,37 +2305,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
Geauthenticeerd maar nogsteeds wachten op de DHCP lease
- Connecting to wifi failed
Connectie maken met wifi is mislukt
- Connecting to the wifi access point failed. Check your password
Kan geen connectie maken met het WiFI access point. Check uw wachtwoord
- Cancel
Annuleren
- Releasing old DHCP lease
Uitgeven van ouwe DHCP lease
- Disconnecting
Uitschakkelen van verbinding
- Connecting
Verbinden
diff --git a/recovery/translation_no.ts b/recovery/translation_no.ts
index 719c103d..35fc2f01 100644
--- a/recovery/translation_no.ts
+++ b/recovery/translation_no.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Avslutter skriving (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -690,541 +691,541 @@ WARNING: This will erase all data on your SD card
W
- Setting up SD card
Klargjør SD-kort
- RECOMMENDED
ANBEFALES
- Confirm
Bekreft
- Error mounting settings partition
Feil ved montering av innstillingspartisjon
- Persistent settings partition seems corrupt. Reformat?
Varig innstillingspartisjon ser ut til å være korrupt. Reformatter?
- Reformat failed
Reformattering feilet
- SD card might be damaged
SD-kort kan være ødelagt
- Please wait while PINN initialises
Vennligst vent mens PINN initialiseres
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Error
Feil
- Display Mode Changed
Visningsmodus endret
- HDMI preferred mode
HDMI foretrukket modus
- Waiting for SD card (settings partition)
Venter på SD-kort (innstillingspartisjon)
- Mounting settings partition
Monterer instillingspartisjon
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
SD-kort
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Advarsel: inkompatible OS8er) oppdaget. Følgende OS(er) er ikke støttet av denne versjon av Raspberry Pi og kan feile ved boot eller ikke funksjonerer riktig:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS(er) installert med hell
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
HDMI sikkermodus
- composite PAL mode
komposit PAL-modus
- composite NTSC mode
komposit NTSC-modus
- Display mode changed to %1
Would you like to make this setting permanent?
Visningsmodus endret til %1 Vil du gjøre denne innstillingen permanent?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
Feil ved nedlasting av distribusjonsliste fra internett:
- Download error
Nedlastingsfeil
- Error parsing repolist.json downloaded from server
Feil ved analysering av repolist.json nedlastet fra server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
Nettverkstilgang er nødvendig for å bruke PINN uten lokal avbildning. Velg ditt WiFi-nettverk i neste bilde.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
Kablet nettverkstilgang er nødvendig for å bruke PINN uten lokal avbildning. Monter en nettverkskabel til nettverksporten.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Er du sikker på at du vil formattere drive '%1' for bruk av PINN? Alle eksisterende data på drivet vil slettes!
- This will erase all content on the device '%s'. Are you sure?
Dette vil slette alt innhold på enheten '%s'. Er du sikker?
- Clone SD Card
Klone SD-kort
- Yes
Ja
- No
Nei
- Clone Completed
Kloning ferdig
- Clone Completed Successfully
Kloning utført med hell
- Error downloading update file
Feil ved nedlasting av oppdateringsfil
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
PINN OPPDATERING
- A new version of PINN is available
En ny versjon av PINN er tilgjengelig
- Do you want to download this version?
Vil du laste ned denne versjonen?
- Downloading Update
Laster ned oppdatering
- Press ESC to cancel
Trykk ESC for å avbryte
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
VEd ved analysering av list.json nedlastet fra server
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- PINN v%1 - Built: %2 (%3) %4
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Nødvendig
- Available
Tilgjengelig
- Error downloading meta file
Feil ved nedlasting av meta-fil
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Feil ved skriving av nedlastet fil til SD-kort. SD-kort eller filsystem kan være ødelagt.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Reformatter drive?
- No network access
Ingen nettverkstilgang
- Wired network access is required for this feature. Please insert a network cable into the network port.
Kablet nettverkstilgang er nødvendig for denne funksjonen. Monter en nettverkskabel til nettverksporten.
@@ -1232,37 +1233,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Avslutter skriving (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Feil ved nedlasting eller utpakking av tabell
- Finished downloading %1
@@ -1280,51 +1281,51 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kan ikke installeres. Størrelse på opprettingspartisjonen er for stor.
- Operating system cannot require a system partition (1,5)
Operativsystemet kan ikke kreve en systempartisjon (1,5)
- Operating system cannot claim both primary partitions 2 and 4
Operativsystemet kan ikke kreve begge primærpartisjoner 2 og 4
- Not enough disk space. Need %1 MB, got %2 MB
Ikke nok diskplass. Trenger %1 MB, har %2 MB
- Finish writing (sync)
Avslutter skriving (sync)
- File '%1' does not exist
Fil '%1' eksisterer ikke
- %1: Writing OS image
%1: Skriver OS-avbildning
- %1: Mounting file system
%1: Monterer filsystem
- %1: Error mounting file system
%1: Feil ved montering av filsystem
- %1: Creating filesystem (%2)
%1: Oppretter filsystem (%2)
@@ -1339,169 +1340,184 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kan ikke installeres. RISCOS offsetverdi mangler.
- More than one operating system requires partition number %1
Mer enn et OS trenger partisjon nummer %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Fast partisjonsoffset for lav
- Writing partition table
Skriver partisjonstabell
- Writing boot partition table
Skriver partisjonstabell for boot
- Zero'ing start of each partition
Nullstiller start for hver partisjon
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Feil ved lesing av eksisterende partisjonstabell
- Error creating partition table
Feil ved opprettelse av partisjonstabell
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Laster ned og pakker ut filsystem
- %1: Extracting filesystem
%1: Pakker ut filsystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1: Monterer FAT-partisjon
- %1: Creating os_config.json
%1: Oppretter os_config.json
- %1: Saving display mode to config.txt
%1: Lagrer visningsmodus til config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
%1: Kjører script for partisjonsoppsett
- %1: Error executing partition setup script
%1: Feil ved utførelse av script for oppsett
- %1: Configuring flavour
%1: Konfigureringsvalg
- %1: Unmounting FAT partition
%1: Avmonterer FAT-partisjon
- %1: Error unmounting
%1: Feil ved avkobling
- %1: Checking firmware update
- Error creating file system
Feil ved opprettelse av filsystem
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Ukjent filetternavn for komprimert fil. Forventer .lzo, .gz, .xz, .bz2 eller .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Feil ved nedlasting eller utpakking av tabell
- Error downloading or writing OS to SD card
Feil ved nedlasting eller skriving av OS til SD-kort
@@ -1525,7 +1541,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1535,500 +1552,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2170,22 +2187,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB skrevet (%2 MB/sek)
@@ -2274,37 +2291,37 @@ Are you sure?
Ingen wifi grensesnitt tilgjengelig
- Authenticated but still waiting for DHCP lease
Autorisert, men venter på DHCP-avtale
- Connecting to wifi failed
Tilkobling til wifi feilet
- Connecting to the wifi access point failed. Check your password
Tilkobling til wifi aksesspunkt feilet. Kontroller passord
- Cancel
Avbryt
- Releasing old DHCP lease
Frigjør gammel DHCP-avtale
- Disconnecting
Kobler fra
- Connecting
Kobler til
diff --git a/recovery/translation_pl.ts b/recovery/translation_pl.ts
index 08c2e80a..f7888475 100644
--- a/recovery/translation_pl.ts
+++ b/recovery/translation_pl.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Kończenie zapisywania (zrzucanie buforów)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ UWAGA: To usunie wszystkie dane zapisane na karcie SD
- RECOMMENDED
ZALECANE
- Confirm
Potwierdź
- Setting up SD card
Przygotwywanie karty SD
- Error mounting settings partition
Błąd montowania partycji z ustawieniami
- Persistent settings partition seems corrupt. Reformat?
Partycja ze stałymi ustawieniami zdaje się być uszkodzona. Sformatować ponownie?
- Reformat failed
Ponowne formatowanie nieudane
- SD card might be damaged
Karta SD może być uszkodzona
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Błąd
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Tryb wyświetlania zmieniony
- HDMI preferred mode
tryb preferowany HDMI
- Waiting for SD card (settings partition)
- Mounting settings partition
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
System(y) operacyjny zainstalowany pomyślnie
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
tryb bezpieczny HDMI
- composite PAL mode
tryb composite PAL
- composite NTSC mode
tryb composite NTSC
- Display mode changed to %1
Would you like to make this setting permanent?
Tryb wyświetlania zmieniony na: %1
Czy chcesz zachować te ustawienia?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
Błąd pobierania
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Błąd analizowania list.json pobranej z serwera
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Wymagane
- Available
Dostępne
- Error downloading meta file
Błąd pobierania metapliku
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Błąd zapisywania pobranego pliku na kartę SD. Karta lub system plików mogą być uszkodzone.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Brak połączenia z siecią
- Wired network access is required for this feature. Please insert a network cable into the network port.
Kablowe połączenie sieciowe jest wymagane do tej funkcji. Prosze włożyć kabel sieciowy do odpowiedniego portu.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Kończenie zapisywania (zrzucanie buforów)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Błąd pobierania lub rozpakowywania pliku tar
- Finished downloading %1
@@ -1283,44 +1284,44 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS nie może być zainstalowany. Rozmiar partycji odzyskiwania jest zbyt duży.
- Not enough disk space. Need %1 MB, got %2 MB
Za malo miejsca na dysku. Wymagane %1 MB, dostępne %2 MB
- Finish writing (sync)
Kończenie zapisywania (zrzucanie buforów)
- File '%1' does not exist
Plik '%1' nie istnieje
- %1: Writing OS image
Writing image
%1: Zapisywanie obrazu systemu operacyjnego
- %1: Mounting file system
Mounting file system
%1: Montowanie systemu plików
- %1: Error mounting file system
Error mounting file system
%1: Błąd montowania systemu plików
- %1: Creating filesystem (%2)
%1: Tworzenie systemu plików (%2)
@@ -1335,187 +1336,202 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Pobieranie i rozpakowywanie systemu plików
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Rozpakowywanie systemu plików
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Montowanie partycji FAT
- %1: Creating os_config.json
Creating os_config.json
%1: Tworzenie os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Zapisywanie trybu wyświetlania do config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Uruchamianie skryptu konfiguracji partycji
- %1: Error executing partition setup script
Error executing partition setup script
%1: Błąd wykonywania skryptu konfiguracji partycji
- %1: Configuring flavour
- %1: Unmounting FAT partition
Unmounting FAT partition
%1: Odmontowywanie partycji FAT
- %1: Error unmounting
Error unmounting
%1: Błąd odmontowywania
- %1: Checking firmware update
- Error creating file system
Błąd tworzenia systemu plików
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Nieznane rozszerzenie skompresowanego pliku. Oczekiwane: .lzo, .gz, .xz, .bz2 lub .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Błąd pobierania lub rozpakowywania pliku tar
- Error downloading or writing OS to SD card
Błąd pobierania lub zapisywania systemu operacyjnego na kartę SD
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB zapisane (%2 MB/sek)
@@ -2328,37 +2345,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Anuluj
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_pt.ts b/recovery/translation_pt.ts
index 2a278c83..eca23f75 100644
--- a/recovery/translation_pt.ts
+++ b/recovery/translation_pt.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Finalizando a gravação
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,544 +692,544 @@ AVISO: Isto irá apagar todos os dados do seu cartão SD
W
- RECOMMENDED
RECOMENDADO
- Confirm
Confirmar
- Setting up SD card
Configurando cartão SD
- Error mounting settings partition
Erro ao montar partição de configurações
- Persistent settings partition seems corrupt. Reformat?
A partição de configurações persistente parece estar corrompida. Reformatar?
- Reformat failed
Falha ao reformatar
- SD card might be damaged
O cartão SD pode estar corrompido
- Please wait while PINN initialises
Por favor, aguarde enquanto o PINN inicializa
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Erro
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Modo de Exibição Alterado
- HDMI preferred mode
Modo preferido HDMI
- Waiting for SD card (settings partition)
Aguardando pelo cartão SD (partição de configurações)
- Mounting settings partition
Montando partição de configurações
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
Cartão SD
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Aviso: Sistema Operacional incompatível detectado. Os seguintes sistemas não são suportados nesta revisão do Raspberry Pi e a inicialização pode falhar ou funcionar corretamente:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
Sistema(s) Instalado(s) com Sucesso
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
Modo seguro HDMI
- composite PAL mode
Modo PAL composto
- composite NTSC mode
Modo NTSC composto
- Display mode changed to %1
Would you like to make this setting permanent?
Modo de exibição alterado para %1
Deseja tornar esta configuração permanente?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
Erro ao baixar lista de distribuições da Internet:
- Download error
Erro no download
- Error parsing repolist.json downloaded from server
Erro ao analisar repolist.json baixado do servidor
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
O acesso à rede é necessário para usar o PINN sem imagens locais. Selecione sua rede wi-fi na próxima tela.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
O acesso à rede é necessário para usar o PINN sem imagens locais. Por favor, conecte o cabo de rede na porta de rede.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
Tem certeza de que deseja reformatar a unidade '%1' para uso com o PINN? Todos os dados existentes na unidade serão excluídos!
- This will erase all content on the device '%s'. Are you sure?
Isso irá apagar todo o conteúdo no dispositivo '%s'. Você tem certeza?
- Clone SD Card
Clonar Cartão SD
- Yes
Sim
- No
Não
- Clone Completed
Clonar Concluído
- Clone Completed Successfully
Clonar Concluído com Sucesso
- Error downloading update file
Erro ao baixar arquivo de atualização
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
ATUALIZAÇÃO DO PINN
- A new version of PINN is available
Uma nova versão do PINN está disponível
- Do you want to download this version?
Deseja baixar esta versão?
- Downloading Update
Baixando Atualização
- Press ESC to cancel
Pressione ESC para cancelar
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Erro ao analisar list.json baixado do servidor
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Necessário
- Available
Disponível
- Error downloading meta file
Erro ao baixar arquivo meta
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Erro ao salvar arquivo baixado para o cartão SD. O cartão ou sistema de arquivos pode estar danificado.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
Reformatar unidade?
- No network access
Sem acesso de rede
- Wired network access is required for this feature. Please insert a network cable into the network port.
Acesso de rede cabeado é necessário para este recurso. Por favor, insira um cabo de rede.
@@ -1236,37 +1237,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Finalizando a gravação
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Erro ao baixar ou extrair tarball
- Finished downloading %1
@@ -1284,54 +1285,54 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS não pôde ser instalado. O tamanho da partição de recuperação é muito grande.
- Operating system cannot require a system partition (1,5)
O sistema operacional não pode requerer uma partição do sistema (1,5)
- Operating system cannot claim both primary partitions 2 and 4
O sistema operacional não pode requerer ambas as partições primárias 2 e 4
- Not enough disk space. Need %1 MB, got %2 MB
Espaço em disco insuficiente. São necessários %1 MB, mas há %2 MB
- Finish writing (sync)
Finalizando a gravação
- File '%1' does not exist
O arquivo '%1' não existe
- %1: Writing OS image
Writing image
%1: Salvando imagem do SO
- %1: Mounting file system
Mounting file system
%1: Montando sistema de arquivos
- %1: Error mounting file system
Error mounting file system
%1: Montando sistema de arquivos
- %1: Creating filesystem (%2)
%1: Criando sistema de arquivos (%2)
@@ -1346,177 +1347,192 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS não pode ser instalado. Valor de offset do RISCOS faltando.
- More than one operating system requires partition number %1
Mais do que um sistema operacional requere a partição número %1
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Offset de partição muito baixo corrigido
- Writing partition table
Escrevendo a tabela de partição
- Writing boot partition table
Escrevendo a tabela de partição do boot
- Zero'ing start of each partition
Zerando início de cada partição
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Erro na leitura da tabela de partição existente
- Error creating partition table
Erro ao criar tabela da partição
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Baixando e extraindo sistema de arquivos
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Extraindo sistema de arquivos
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Montando partição FAT
- %1: Creating os_config.json
Creating os_config.json
%1: Criando os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Salvando modo de exibição para config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Executando script de configuração da partição
- %1: Error executing partition setup script
Error executing partition setup script
%1: Erro ao executar o script de configuração da partição
- %1: Configuring flavour
%1: Configurando flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: Desmontando partição FAT
- %1: Error unmounting
Error unmounting
%1: Erro ao desmontar
- %1: Checking firmware update
- Error creating file system
Erro ao criar sistema de arquivos
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Extensão do formato de arquivo de compressão desconhecido. Esperando .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Erro ao baixar ou extrair tarball
- Error downloading or writing OS to SD card
Erro ao baixar ou salvar o SO para o cartão SD
@@ -1540,7 +1556,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1550,500 +1567,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2185,22 +2202,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB gravado(s) (%2 MB/s)
@@ -2289,37 +2306,37 @@ Are you sure?
Nenhuma interface wi-fi
- Authenticated but still waiting for DHCP lease
Autenticado, mas ainda aguardando concessão DHCP
- Connecting to wifi failed
Falha ao conectar ao wi-fi
- Connecting to the wifi access point failed. Check your password
Falha ao conectar no ponto de acesso wi-fi. Verifique sua senha
- Cancel
Cancelar
- Releasing old DHCP lease
Liberando concessão DHCP antiga
- Disconnecting
Desconectando
- Connecting
Conectando
diff --git a/recovery/translation_ru.ts b/recovery/translation_ru.ts
index 07064471..2eda89a6 100644
--- a/recovery/translation_ru.ts
+++ b/recovery/translation_ru.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Закончена запись(sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,543 +692,543 @@ WARNING: This will erase all data on your SD card
W
- RECOMMENDED
РЕКОМЕНДУЕТСЯ
- Confirm
Подтвердить
- Setting up SD card
Настройка SD карты
- Error mounting settings partition
Ошибка монтирования настроек раздела
- Persistent settings partition seems corrupt. Reformat?
Существующий раздел настроек кажется поврежденным. Переформатировать?
- Reformat failed
Форматирование не удалось.
- SD card might be damaged
SD карта может быть поврежденаы
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Ошибка
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Режим дисплея изменен
- HDMI preferred mode
Предпочтительный HDMI режим
- Waiting for SD card (settings partition)
- Mounting settings partition
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
ОС установленны успешно
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
Безопасный режим HDMI
- composite PAL mode
Композитный PAL режим
- composite NTSC mode
Композитный NTSC режим
- Display mode changed to %1
Would you like to make this setting permanent?
Режим дисплея изменен на %1
Вы всегда хотите использовать эту настройку?
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
Ошибка загрузки
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Ошибка извлечения list.json загруженного с серера
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Необходимо
- Available
Доступно
- Error downloading meta file
Ошибка загрузки мета файла
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Ошибка записи загруженных файлов на SD карту. SD карта может быть повреждена.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Нету доступа в интернет
- Wired network access is required for this feature. Please insert a network cable into the network port.
Проводная сеть необходима для использования этой функции. Пожалуйста вставьте кабель к интернет порт.
@@ -1235,37 +1236,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Закончена запись(sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Ошибка загрузки или распаковки архива
- Finished downloading %1
@@ -1283,44 +1284,44 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS не может быть установленна. Размер раздела слишком большой.
- Not enough disk space. Need %1 MB, got %2 MB
Не достаточно места. Необходимо %1 MB, есть %2 MB
- Finish writing (sync)
Закончена запись(sync)
- File '%1' does not exist
- %1: Writing OS image
Writing image
%1: Запись образа ОС
- %1: Mounting file system
Mounting file system
%1: Монтирование файловой системы
- %1: Error mounting file system
Error mounting file system
%1: Ошибка монтирования файловой системы
- %1: Creating filesystem (%2)
%1: Создание файловой системы (%2)
@@ -1335,187 +1336,202 @@ Booting this drive again will re-instate PINN's partition structure.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Загрузка и извлечение файловой системы
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Распаковка файловой системы
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Монтироавние FAT раздела
- %1: Creating os_config.json
Creating os_config.json
%1: Создание os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Сохранение режима дисплея в config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Запуск сценария разбиения
- %1: Error executing partition setup script
Error executing partition setup script
%1: Ошибка при выполнении сценария разделения
- %1: Configuring flavour
- %1: Unmounting FAT partition
Unmounting FAT partition
%1: Размонтирование раздела FAT
- %1: Error unmounting
Error unmounting
%1: Ошибка размонтирования
- %1: Checking firmware update
- Error creating file system
Ошибка создания файловой системы
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Неизвестный формат файла. Ожидался .lzo, .gz, .xz, .bz2 или .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Ошибка загрузки или распаковки архива
- Error downloading or writing OS to SD card
Ошибка загрузки ли записи ОС на SD карту
@@ -1539,7 +1555,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1549,500 +1566,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2184,22 +2201,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB запись (%2 MB/сек)
@@ -2328,37 +2345,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Отмена
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_sv.ts b/recovery/translation_sv.ts
index 03e21c56..3deba03a 100644
--- a/recovery/translation_sv.ts
+++ b/recovery/translation_sv.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Avslutar skrivning (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,542 +692,542 @@ VARNING: Detta kommer radera all data på ditt SD-kort
W
- Setting up SD card
Förbereder SD-kort
- Error mounting settings partition
Fel vid montering av inställningspartition
- Waiting for SD card (settings partition)
- Mounting settings partition
- Persistent settings partition seems corrupt. Reformat?
Inställningspartitionen verkar vara korrupt. Omformatera?
- Reformat failed
Omformatering misslyckades
- SD card might be damaged
SD-kortet kan vara skadat
- Main Menu
- Archival
- Maintenance
- Please wait while PINN initialises
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- RECOMMENDED
REKOMMENDERAD
- ERROR
- Error: Some OSes are not available:
- Confirm
Bekräfta
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed with errors.
See debug log for details
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Varning: Inkompatibelt operativsystem upptäckt. Följande operativsystem stöds ej på denna revision av Raspberry Pi och kan misslyckas med att boota eller fungera korrekt:
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- OS(es) Installed Successfully
Installation av operativsystem lyckades
- Error
Fel
- PINN v%1 - Built: %2 (%3) %4
- HDMI preferred mode
HDMI föredraget läge
- HDMI safe mode
HDMI säkert läge
- composite PAL mode
Kompositvideo PAL-läge
- composite NTSC mode
Kompositvideo NTSC-läge
- Display Mode Changed
Bildskärmsläge ändrat
- Display mode changed to %1
Would you like to make this setting permanent?
Bildskärmsläge ändrades till %1
Vill du spara detta som standardinställning?
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- No network access
Ingen nätverksåtkomst
- Wired network access is required for this feature. Please insert a network cable into the network port.
Nätverksåtkomst krävs för att använda denna funktion. Vänligen koppla in en nätverkskabel till din Raspberry Pi.
- Error downloading distribution list from Internet:
- Download error
Nedladdningsfel
- Error parsing list.json downloaded from server
Fel vid tolkning av list.json nedladdad från server
- Needed
Krävs
- Available
Tillgängligt
- Error downloading meta file
Fel vid nedladdning av meta-fil
- Error writing downloaded file to SD card. SD card or file system may be damaged.
Fel vid skrivning av nedladdad fil till SD-kort. SD-kort eller filsystem kan vara skadade.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
@@ -1234,37 +1235,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
Avslutar skrivning (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
Fel vid nedladdning eller extrahering av arkiv
- Finished downloading %1
@@ -1282,44 +1283,44 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kan inte bli installerad. Återställningspartition för stor.
- Not enough disk space. Need %1 MB, got %2 MB
För lite lagringsutrymme. Kräver %1 MB, har %2 MB
- Finish writing (sync)
Avslutar skrivning (sync)
- File '%1' does not exist
Filen %1 existerar ej
- %1: Writing OS image
Writing image
%1: Skriver operativsystemsavbild
- %1: Mounting file system
Mounting file system
%1: Monterar filsystem
- %1: Error mounting file system
Error mounting file system
%1: Fel vid montering av filsystem
- %1: Creating filesystem (%2)
%1: Skapar filsystem (%2)
@@ -1334,187 +1335,202 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS kan ej installeras. RISCOS förskjutningsvärde (offset) saknas.
- More than one operating system requires partition number %1
- Operating system cannot require a system partition (1,5)
- Operating system cannot claim both primary partitions 2 and 4
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
- Writing partition table
- Writing boot partition table
- Zero'ing start of each partition
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
- Error creating partition table
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Laddar ner och extraherar filsystem
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Extraherar filsystem
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mouning FAT partition
%1: Monterar FAT-partition
- %1: Creating os_config.json
Creating os_config.json
%1: Skapar os_config.json
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Sparar bildskärmsläge till config.txt
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Kör partitioneringsscript
- %1: Error executing partition setup script
Error executing partition setup script
%1: Fel vid körning av partitioneringsscript
- %1: Configuring flavour
- %1: Unmounting FAT partition
Unmounting FAT partition
%1: Avmonterar FAT-partition
- %1: Error unmounting
Error unmounting
%1: Fel vid avmontering
- %1: Checking firmware update
- Error creating file system
Fel vid skapande av filsystem
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Okänd filändelse för kompressionsformat. Förväntar .lzo, .gz, .xz, .bz2 eller .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
Fel vid nedladdning eller extrahering av arkiv
- Error downloading or writing OS to SD card
Fel vid nedladdning eller skrivning av OS till SD-kort
@@ -1538,7 +1554,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1548,500 +1565,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2183,22 +2200,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB kopierat (%2 MB/s)
@@ -2327,37 +2344,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
- Connecting to wifi failed
- Connecting to the wifi access point failed. Check your password
- Cancel
Avbryt
- Releasing old DHCP lease
- Disconnecting
- Connecting
diff --git a/recovery/translation_tr.ts b/recovery/translation_tr.ts
index eba68240..bd9f0940 100644
--- a/recovery/translation_tr.ts
+++ b/recovery/translation_tr.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
Yazmayı bitir (sync)
- Cannot backup
- :BTRFS file format
- %1: Updating partitions.json
- %1: Writing image (%2)
- %1: Archiving (%2)
- Error writing
- : Disk full?
- %1: Checksumming (%2)
- %1: Updating os.json
@@ -133,7 +133,8 @@
Edit Options
+ &Edit Options
+ Edit Options
@@ -691,542 +692,542 @@ UYARI: Bu işlem SD kartınızdaki tüm verileri silecektir
W
- RECOMMENDED
TAVSİYEDİR
- Confirm
Onayla
- Setting up SD card
SD kart ayarlanıyor
- Error mounting settings partition
Ayar bölümünü bağlamada hata
- Persistent settings partition seems corrupt. Reformat?
Kalıcı ayarlar bölümü bozulmuş görünüyor. Biçimlendir?
- Reformat failed
Biçimlendirme hatası
- SD card might be damaged
SD kart hasarlı olabilir
- Please wait while PINN initialises
- is not available.
Please provide it locally or connect to the internet.
- OS(es) Downloaded Successfully.
- Error
Hata
- PINN v%1 - Built: %2 (%3) %4
- Display Mode Changed
Ekran Modu Değiştirildi
- HDMI preferred mode
HDMI tercihli mod
- Waiting for SD card (settings partition)
SD kart bekleniyor (ayar bölümü)
- Mounting settings partition
Ayar bölümü bağlanıyor
- Main Menu
- Archival
- Maintenance
- ERROR
- Error: Some OSes are not available:
- SD card
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
Uyarı: uyumsuz İşletim Sistemleri tespit edildi. Bu işletim sistemi mevcut Raspberry Pi revizyonunda desteklenemez ve açılışta ya da çalışırken hatalar oluşabilir
- ReInstall OSes
- Warning: No OSes selected or available
- Warning: this will download the selected Operating System(s).
- The download process will begin shortly.
- OS(es) downloaded
- OS(es) Backed up with errors.
See debug log for details
- OS(es) Backed up Successfully.
- Backup OSes
- OS(es) Installed Successfully
OS Installed Successfully
OS(ler) Başarıyla Kuruldu
- Installation complete
- Abort
- Discard
- Retry
- Keep
- Reboot in %1 secs
- HDMI safe mode
HDMI güvenli mod
- composite PAL mode
Kompozit PAL modu
- composite NTSC mode
Kompozit NTSC modu
- Wiping SD card
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
- Drive Wiped!
- Error downloading distribution list from Internet:
- Download error
İndirme hatası
- Error parsing repolist.json downloaded from server
- Error downloading meta file:
- Replace OSes
- Resume partial downloads?
- Normally select NO, unless your last download was not successful, in which case select YES
- This backup may require
- MB of backup space, but only
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
- WARNING: Backup Space
- Backup Info
- Always test your backups before relying on them
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
- This will erase all content on the device '%s'. Are you sure?
- Clone SD Card
- Yes
- No
- Clone Completed
- Clone Completed Successfully
- Error downloading update file
- PINN Update Check
- Error contacting update server
- No updates available
- PINN UPDATE
- A new version of PINN is available
- Do you want to download this version?
- Downloading Update
- Press ESC to cancel
- Error: No OSes selected
(Do not choose RISC OS or PINN)
- Warning: No OSes selected
- Warning: this will backup the selected Operating System(s).
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
- Error parsing list.json downloaded from server
Sunucudan indirilen list.json çözümlenirken hata
- install
- reinstall
- replace
- USB drive
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
- The %1 process will begin shortly.
- OS(es) Downloaded with errors.
See debug log for details
- OS(es) Installed with errors.
See debug log for details
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
- Needed
Gerekli
- Available
Mevcut
- Error downloading meta file
Meta dosyası indirilirken hata
- Error writing downloaded file to SD card. SD card or file system may be damaged.
İndirilen dosya SD karta yazılırken hata. SD kart ya da dosya sistemi hasarlı olabilir.
- filesize error checking
- has an incompatible number of partitions with
- Reformat drive?
- No network access
Ağ erişimi yok
- Display mode changed to %1
Would you like to make this setting permanent?
- Wired network access is required for this feature. Please insert a network cable into the network port.
Bu özellik için yerel ağa erişimi olması gereklidir. Lütfen ağ kablosunu ağ portuna takın.
@@ -1234,37 +1235,37 @@ Would you like to make this setting permanent?
MultiImageDownloadThread
- Finish writing (sync)
Yazmayı bitir (sync)
- File '%1' does not need downloading
- Downloading %1:%2
- Checking %1:%2
- Error in checksum
- Error downloading or extracting tarball
tarball indirilir ya da çıkartılırken hata oluştu
- Finished downloading %1
@@ -1282,54 +1283,54 @@ Would you like to make this setting permanent?
RISCOS kurulamaz. Kurtarma bölümünün boyutu çok fazla.
- Operating system cannot require a system partition (1,5)
İşletim sistemi sistem bölümüne (1,2,5) ihtiyaç duyamaz {1,5)?}
- Operating system cannot claim both primary partitions 2 and 4
- Not enough disk space. Need %1 MB, got %2 MB
Yeterli disk alanı yok. %1 MB gerekli, %2 MB var
- Finish writing (sync)
Yazmayı bitir (sync)
- File '%1' does not exist
'%1' adlı dosya yok
- %1: Writing OS image
Writing image
%1: OS imajı yazılıyor
- %1: Mounting file system
Mounting file system
%1: Dosya sistemi bağlanıyor
- %1: Error mounting file system
Error mounting file system
%1: Dosya sistemi bağlanırken hata
- %1: Creating filesystem (%2)
%1: Dosya sistemi oluşturuluyor (%2)
@@ -1344,177 +1345,192 @@ Would you like to make this setting permanent?
RISCOS kurulamaz. RISCOS ofset değeri bulunamadı.
- More than one operating system requires partition number %1
Birden fazla işletim sistemi %1 numaralı bölüme ihtiyaç duyuyor
- Cannot boot partitions > 62. Reduce the number of OSes
- Cannot boot partitions > #62. Reduce the number of OSes
- Fixed partition offset too low
Sabit bölüm ofseti çok düşük
- Writing partition table
Bölüm tablosu yazılıyor
- Writing boot partition table
- Zero'ing start of each partition
Her bölümün başlangıcı sıfırlanıyor
- .
Partition not big enough for new image.
- Cannot Reinstall/Replace
- Operation cancelled by user
- Error reading existing partition table
Mevcut bölüm tablosunu okumada hata
- Error creating partition table
Bölüm tablosu oluşturulurken hata
- OS: '%1' needs a partition label of '%2' which is not available
- %1: Downloading and extracting filesystem
%1: Dosya sistemi indirilip çıkartılıyor
- %1: Extracting filesystem
%1 Extracting filesystem
%1: Dosya sistemi çıkartılıyor
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
Mounting FAT partition
%1: FAT bölümü bağlanıyor
- %1: Creating os_config.json
Creating os_config.json
%1: os_config.json oluşturuluyor
- %1: Saving display mode to config.txt
Saving display mode to config.txt
%1: Ekran modu config.txt'e kaydediliyor
- Error in checksum for partition_setup.sh
- %1: Running partition setup script
Running partition setup script
%1: Bölüm kurulum betiği çalıştırılıyor
- %1: Error executing partition setup script
Error executing partition setup script
%1: Bölüm kurulum betiği çalışırken hata
- %1: Configuring flavour
- %1: Unmounting FAT partition
%1: Patching BCD file
%1: BCD dosyası patchleniyor
- %1: Error unmounting
Error unmounting
%1: Çıkartılırken hata
- %1: Checking firmware update
- Error creating file system
Dosya sistemi oluşturulurken hata
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
Geçersiz sıkıştırma formatı dosya uzantısı. Beklenen .lzo, .gz, .xz, .bz2 or .zip
- An incorrect file checksum has been detected in %1
- Checksum error
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
tarball indirilir ya da çıkartılırken hata oluştu
- Error downloading or writing OS to SD card
OS'u SD karta indirirken ya da yazarken hata
@@ -1538,7 +1554,8 @@ Partition not big enough for new image.
noobsconfig
+ noobs&config
+ noobsconfig
@@ -1548,500 +1565,500 @@ Partition not big enough for new image.
reserve=
-
-
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
+ re&serve=
+ reserve=
configpath=
+ Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
- Amount of space to reserve (MB) on PINN's partition
- Selecting this will erase all of your OSes
- runinstaller
-
-
- Prevents PINN from checking for self updates
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
- allnetwork
-
-
- Ensures all installed OSes are selected again.
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
- waitall
-
-
- The list of OSes that will be selected at startup
- Reserve an ADDITIONAL amount of space
- +
- Automatically reinstalls any selected OSes if newer versions exist
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
- silentinstall
-
-
- select=
-
-
- Source
- Prevents the default RaspberryPi Foundation repository from being used.
- no_default_source
- nodefaultsource
-
-
- Prevents OSes stored on local USB memory devices from being used.
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
- disablesdimages
-
-
- 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.
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
- alt_image_source=
-
-
- Booting
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
- keyboardtriggerenable
-
-
- Interface
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
-
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
-
-
- Changes the style of the windows
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
-
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
- background=<r,g,b>
+ &configpath=
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
- 0
- 1
- 2
- 3
- windows
- motif
- platinum
@@ -2183,22 +2200,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
- %1 MB read (%2 MB/sec)
- %1 MB written (%2 MB/sec)
%1 MB yazıldı (%2 MB/sn)
@@ -2287,37 +2304,37 @@ Are you sure?
- Authenticated but still waiting for DHCP lease
Kimlik doğrulandı ama hala DHCP kirası için bekleniyor
- Connecting to wifi failed
Wifi bağlantısı başarısız
- Connecting to the wifi access point failed. Check your password
Wifi access point bağlantısı başarısız. Şifrenizi kontrol edin
- Cancel
Vazgeç
- Releasing old DHCP lease
Eski DHCP kirası serbest bırakılıyor
- Disconnecting
Bağlantı kesiliyor
- Connecting
Bağlanılıyor
diff --git a/recovery/translation_zh_TW.ts b/recovery/translation_zh_TW.ts
index b41d6b0e..70b6761e 100644
--- a/recovery/translation_zh_TW.ts
+++ b/recovery/translation_zh_TW.ts
@@ -4,52 +4,52 @@
BackupThread
- Finish writing (sync)
寫入完成 (sync)
- Cannot backup
無法備份
- :BTRFS file format
:BTRFS 檔案格式
- %1: Updating partitions.json
%1：正在更新 partitions.json
- %1: Writing image (%2)
%1：正在寫入映像檔 (%2)
- %1: Archiving (%2)
%1：正在歸檔 (%2)
- Error writing
寫入錯誤
- : Disk full?
: 磁碟已滿？
- %1: Checksumming (%2)
%1：正在檢查雜湊碼 (%2)
- %1: Updating os.json
%1：正在更新 os.json
@@ -133,8 +133,9 @@
Edit Options
- 編輯選項
+ &Edit Options
+ Edit Options
+ 編輯選項
W
- Setting up SD card
正在設定 SD 記憶卡
- Waiting for SD card (settings partition)
正在等待 SD 記憶卡（settings 分割區）
- Mounting settings partition
正在掛載 settings 分割區
- Error mounting settings partition
掛載 settings 分割區時發生錯誤
- Persistent settings partition seems corrupt. Reformat?
持續性的 settings 分割區似乎已毀損。重新格式化？
- Reformat failed
重新格式化失敗
- SD card might be damaged
SD 記憶卡可能已受損
- install
安裝
- reinstall
重新安裝
- replace
取代
- USB drive
USB 磁碟
- Warning: this will %1 the selected Operating System(s) to %2. All existing data on the %3 will be deleted.
警告：這將會 %1 選定的作業系統到 %2。所有在 %3 上的資料都將會被刪除。
- The %1 process will begin shortly.
%1 程序將會很快開始。
- RECOMMENDED
建議
- Confirm
確認
- Main Menu
主選單
- Archival
封存
- Maintenance
維護
- Please wait while PINN initialises
請等待 PINN 初始化
- ERROR
錯誤
- Error: Some OSes are not available:
錯誤：部份作業系統不可用：
- SD card
SD 記憶卡
- Warning: incompatible Operating System(s) detected. The following OSes aren't supported on this revision of Raspberry Pi and may fail to boot or function correctly:
警告：已偵測到不相容的作業系統。以下的作業系統在此版本的 Raspberry Pi 不被支援，它們可能會啟動失敗，或是有功能執行不正確：
- ReInstall OSes
重新安裝作業系統
- Warning: No OSes selected or available
警告：未選擇作業系統或未提供
- Warning: this will download the selected Operating System(s).
警告：這將會下載選定的作業系統。
- The download process will begin shortly.
很快就會開始下載。
- OS(es) downloaded
作業系統已下載完成
- OS(es) Backed up with errors.
See debug log for details
作業系統備份時發生錯誤。
檢視除錯紀錄檔以取得更多資訊
- OS(es) Backed up Successfully.
作業系統備份成功。
- Backup OSes
備份作業系統
- OS(es) Installed Successfully
作業系統已成功安裝
- Installation complete
安裝完成
- Error
錯誤
- Abort
放棄
- Discard
丟棄
- Retry
重試
- Keep
保留
- Reboot in %1 secs
在 %1 秒內重新啟動
- Wiping SD card
抹除 SD 記憶卡
- Warning: this will restore your PINN drive to its initial state. All existing data on the drive except PINN will be overwritten, including any OSes that are already installed.
Warning: this will restore your SD card to its initial state. All existing data on the SD card except PINN will be overwritten, including any OSes that are already installed.
警告：這將會讓您的 PINN 磁碟復原到初始狀態。所有在磁碟上，除了 PINN 以外既有的資料都將會被覆寫，其中也包含任何您已安裝的作業系統。
- Drive Wiped!
磁碟已抹除！
- Error parsing repolist.json downloaded from server
解析從伺服器下載的 repolist.json 時發生錯誤
- Error downloading meta file:
下載詮釋檔案錯誤：
- Replace OSes
取代作業系統
- Resume partial downloads?
復原部份下載？
- Normally select NO, unless your last download was not successful, in which case select YES
一般會選擇否，除非您最後一次下載並未成功，這種情況下才會選取是
- This backup may require
這個備份可能需要
- MB of backup space, but only
MB 的備份空間，但只有
- MB is available. This is only an estimate. If you continue, the backup may not complete successfully.
Do you want to continue?
@@ -968,201 +969,201 @@ Do you want to continue?
您想要繼續嗎？
- WARNING: Backup Space
警告：備份空間
- Backup Info
備份資訊
- Always test your backups before relying on them
在依賴您備份前請測試它們
- Network access is required to use PINN without local images. Please select your wifi network in the next screen.
不使用本機映像檔的 PINN 需要網路。請在下一個畫面選擇您的 wifi 連線。
- Wired network access is required to use PINN without local images. Please insert a network cable into the network port.
不使用本機映像檔的 PINN 需要有線網路。請將網路線插入網路孔。
- Are you sure you want to reformat the drive '%1' for use with PINN? All existing data on the drive will be deleted!
您確定您要重新格式化磁碟 '%1' 以供 PINN 使用嗎？所有在該磁碟上的資料都會被刪除！
- This will erase all content on the device '%s'. Are you sure?
這將會抹除在裝置 '%s' 上的所有內容。您確定嗎？
- Clone SD Card
再製 SD 記憶卡
- Yes
是
- No
否
- Clone Completed
再製完成
- Clone Completed Successfully
再製成功完成
- Error downloading update file
下載更新檔時發生錯誤
- PINN Update Check
PINN 更新檢查
- Error contacting update server
聯絡更新伺服器發生錯誤
- No updates available
無可用更新
- PINN UPDATE
PINN 更新
- A new version of PINN is available
已有新版的 PINN 可用
- Do you want to download this version?
您想要下載此版本嗎？
- Downloading Update
正在下載更新
- Press ESC to cancel
按 ESC 取消
- Error: No OSes selected
(Do not choose RISC OS or PINN)
錯誤：沒有已選取的作業系統
（不要選取 RISC OS 或 PINN）
- Warning: No OSes selected
警告：沒有選擇作業系統
- Warning: this will backup the selected Operating System(s).
警告：這將會備份選定的作業系統。
- Warning: Unsupported Operating System(s) detected. PINN currently cannot backup the following OSes correctly:
警告：偵測到不支援的作業系統。PINN 目前無法正確備份下列的作業系統：
- HDMI preferred mode
偏好 HDMI 模式
- is not available.
Please provide it locally or connect to the internet.
不可用。
請在本機提供它，或是連線到網際網路。
- OS(es) Downloaded with errors.
See debug log for details
作業系統下載時發生錯誤。
檢視除錯紀錄以取得更多資訊
- OS(es) Downloaded Successfully.
作業系統已下載成功。
- OS(es) Installed with errors.
See debug log for details
作業系統安裝時發生錯誤。
檢視除錯紀錄以取得更多資訊
- PINN v%1 - Built: %2 (%3) %4
PINN v%1 - 建構： %2 (%3) %4
- HDMI safe mode
HDMI 安全模式
- composite PAL mode
合成 PAL 模式
- composite NTSC mode
合成 NTSC 模式
- Display Mode Changed
顯示模式已變更
- Display mode changed to %1
Would you like to make this setting permanent?
顯示模式已變更為 %1
您想要讓這個設定永久生效嗎？
- Warning: Any installed OSes have been wiped and the drive has been restored to its original size.
Install and download will no longer work until this drive is re-booted.
Booting this drive again will re-instate PINN's partition structure.
@@ -1171,75 +1172,75 @@ Booting this drive again will re-instate PINN's partition structure.
- No network access
無法存取網路
- Wired network access is required for this feature. Please insert a network cable into the network port.
這個功能要求有線網路連線。請插入一條網路纜線至網路埠中。
- Error downloading distribution list from Internet:
從網路上下載散佈版清單時發生錯誤：
- Download error
下載錯誤
- Error parsing list.json downloaded from server
解析從伺服器上下載的 list.json 時發生錯誤
- Needed
需要
- Available
可用
- Error downloading meta file
下載後設檔案時發生錯誤
- Error writing downloaded file to SD card. SD card or file system may be damaged.
寫入已下載的檔案至 SD 記憶卡時發生錯誤。SD 記憶卡或檔案系統可能受損。
- filesize error checking
檢查檔案大小錯誤
- has an incompatible number of partitions with
有不相容數量的分割區
- Reformat drive?
重新格式化磁碟？
@@ -1247,37 +1248,37 @@ Booting this drive again will re-instate PINN's partition structure.
MultiImageDownloadThread
- Finish writing (sync)
寫入完成 (sync)
- File '%1' does not need downloading
檔案「%1」不需要下載
- Downloading %1:%2
正在下載 %1：%2
- Checking %1:%2
正在檢查 %1：%2
- Error in checksum
檢查碼錯誤
- Error downloading or extracting tarball
下載或解壓縮 tarball 時發生錯誤
- Finished downloading %1
下載 %1 結束
@@ -1305,219 +1306,234 @@ Booting this drive again will re-instate PINN's partition structure.RISCOS 無法被安裝。recovery 分割區的大小太大。
- More than one operating system requires partition number %1
多於一個作業系統需要分割區號碼 %1
- Operating system cannot require a system partition (1,5)
作業系統無法要求系統分割區 (1,5)
- Operating system cannot claim both primary partitions 2 and 4
作業系統無法同時要求兩個主要分割區 2 與 4
- Not enough disk space. Need %1 MB, got %2 MB
磁碟空間不足。需要 %1 MB，剩餘 %2 MB
- Cannot boot partitions > 62. Reduce the number of OSes
無法啟動分割去 > 62. 減少作業系統的數量
- Cannot boot partitions > #62. Reduce the number of OSes
無法在分割區上開機 > #62. 減少作業系統的數量
- Fixed partition offset too low
固定分割區偏移量過低
- Writing partition table
正在寫入分割表
- Writing boot partition table
正在寫入開機分割表
- Zero'ing start of each partition
正在將每一個分割區的開頭歸零
- .
Partition not big enough for new image.
.
分割區對新的映像檔來說不夠大。
- Cannot Reinstall/Replace
無法重新安裝／取代
- Operation cancelled by user
操作已由使用者取消
- Finish writing (sync)
寫入完成 (sync)
- Error reading existing partition table
讀取已有的分割表時發生錯誤
- Error creating partition table
建立分割表時發生錯誤
- File '%1' does not exist
檔案「%1」不存在
- OS: '%1' needs a partition label of '%2' which is not available
作業系統：'%1' 需要分割區標籤 '%2'，但並不可用
- %1: Writing OS image
%1：正在寫入作業系統映像檔
- %1: Creating filesystem (%2)
%1：正在建立檔案系統 (%2)
- %1: Mounting file system
%1：正在掛載檔案系統
- %1: Error mounting file system
%1：掛載檔案系統時發生錯誤
- %1: Downloading and extracting filesystem
%1：正在下載並解壓縮檔案系統
- %1: Extracting filesystem
%1：正在解壓縮檔案系統
Syncing Filesystem
+
+
+ %1: Mounting FAT partition
%1：正在掛載 FAT 分割區
- %1: Creating os_config.json
%1：正在建立 os_config.json
- %1: Saving display mode to config.txt
%1：已經儲存顯示模式至 config.txt
- Error in checksum for partition_setup.sh
partition_setup.sh 的檢查碼錯誤
- %1: Running partition setup script
%1：正在執行分割區設定指令稿
- %1: Error executing partition setup script
%1：執行分割區設定指令稿時發生錯誤
- %1: Configuring flavour
%1：正在設定風味
- %1: Unmounting FAT partition
%1：正在解除掛載 FAT 分割區
- %1: Error unmounting
%1：解除掛載錯誤
- %1: Checking firmware update
%1：正在檢查韌體更新
- Error creating file system
建立檔案系統時發生錯誤
- Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip
未知的壓縮格式副檔名。預期為：.lzo、.gz、.xz、.bz2 或是 .zip
- An incorrect file checksum has been detected in %1
在 %1 偵測到不正確的檔案檢查碼
- Checksum error
檢查碼錯誤
- Checksum OK
+
+
+ Finished downloading
+
+
+ Error downloading or extracting tarball
下載或解壓縮 tarball 時發生錯誤
- Error downloading or writing OS to SD card
下載或寫入作業系統至 SD 記憶卡時發生錯誤
@@ -1541,8 +1557,9 @@ Partition not big enough for new image.
noobsconfig
- noobsconfig
+ noobs&config
+ noobsconfig
+ noobsconfig
reserve=
- reserve=
+ re&serve=
+ reserve=
+ reserve=
- Specifies a path or URL where the noobsconfig customisation files can be found (rather than being in /os/<distro>/)
指定尋找 noobsconfig 檔案的路徑或 URL（而不是在 /os/<distro>/）
- configpath=
- configpath=
-
-
- Amount of space to reserve (MB) on PINN's partition
要在 PINN 分割區上保留的空間 (MB)
- Selecting this will erase all of your OSes
選取這個會抹除您所有的作業系統
- runinstaller
- runinstaller
-
-
- Prevents PINN from checking for self updates
避免 PINN 檢查自身的更新
- no_update
- no_update
-
-
- Force PINN to self-update whenever a new version is detected
強制 PINN 在檢測到新版本時自我更新
- forceupdatepinn
- forceupdatepinn
-
-
- DO not update the firmware of old OSes on installation
不要更新安裝上舊版作業系統的韌體
- nofirmware
- nofirmware
-
-
- Selects all OSes where the most recent one is on the SD card
選取所有作業系統，最新的在 SD 記憶卡上
- allsd
- allsd
-
-
- Selects all OSes where the most recent one is on a local USB drive
選取所有作業系統，最新的在 USB 磁碟上
- allusb
- allusb
-
-
- Selects all OSes where the most recent one is on remote repositories.
選取所有作業系統，最新的在遠端倉庫上。
- allnetwork
- allnetwork
-
-
- Ensures all installed OSes are selected again.
確保所有已安裝的作業系統都再次被選取。
- allinstalled
- allinstalled
-
-
- Waits for all OSes on the SD card to be listed
等待所有在 SD 記憶卡上的作業系統被列出
- waitsd
- waitsd
-
-
- Waits for all OSes on local USBs to be listed
等待所有在本機 USB 磁碟上的作業系統被列出
- waitusb
- waitusb
-
-
- Waits for all OS lists to be downloaded from the internet before checking the list of OSes
在檢查作業系統列表前等待所有作業系統清單都被下載
- waitnetwork
- waitnetwork
-
-
- Waits for OSes from all sources to be listed
等待所有來源的作業系統都被列出
- waitall
- waitall
-
-
- The list of OSes that will be selected at startup
作業系統清單將會在啟動時被選取
- Reserve an ADDITIONAL amount of space
保留額外的空間
- +
+
- Automatically reinstalls any selected OSes if newer versions exist
如果新版本可用的話，自動重新安裝任何選定的作業系統
- silentreinstallnewer
- silentreinstallnewer
-
-
- Allows a single or multiple OSes to be installed automatically, useful during headless installs.
允許自動安裝一個或多個作業系統，在無人值守安裝時很有用。
- silentinstall
- silentinstall
-
-
- select=
- select=
-
-
- Source
來源
- Prevents the default RaspberryPi Foundation repository from being used.
避免使用預設的樹莓派基金會倉庫。
- no_default_source
- nodefaultsource
- no_default_source
-
-
- Prevents OSes stored on local USB memory devices from being used.
避免使用儲存在本機 USB 記憶裝置的作業系統。
- disableusbimages
- disableusbimages
-
-
- Prevent OSes stored on the SD card from being used.
避免使用儲存在 SD 記憶卡上的作業系統。
- disablesdimages
- disablesdimages
-
-
- 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.
顯示所有可安裝的作業系統，不管它們是否適用於目前樹莓派的型號。對準備要用於其他樹莓派上的 SD 記憶卡時很有用。
- showall
- showall
-
-
- Provides the URL of a repo_list.json file that contains a list of URLs to other os-list_v3.json files. This allows easy remote management of Internet repositories.
提供包含其他 os-list_v3.json 檔案 URL 的 repo_list.json 檔案 URL。這讓遠端管理網路儲存庫簡單許多。
- repo_list=
- repo_list=
-
-
- Similar to alt_image_source but it matches the NOOBS method of specifying a list of additional respositories as a space separated quoted string.
類似於 alt_image_source 但其與指定其他額外儲存庫的 NOOBS 方法相符合，為以空格分隔的有引號字串。
- repo=
- repo=
-
-
- : Provides the URL of an additional os_list_v3.json file indicating the location of other OSes that can be downloaded from the Internet. Multiple instances of this option can be used.
：提供指出其他作業系統位置的額外 os_list_v3.json 檔案 URL，可以從網路上下載。此選項可以使用多個實體。
- alt_image_source=
- alt_image_source=
-
-
- Booting
開機
- When used in conjunction with forcetrigger it sets a maximum timeout period in seconds for the recovery menu to be displayed before continuing to the boot selection dialog and potentially selecting a default OS to boot.
當與 forcetrigger 一起使用時，它會設定一個最大逾時（以秒為單位），以便在繼續開機選取對話框前顯示復原選單，並可以選取要開機的預設作業系統。
- remotetimeout=<secs>
- remotetimeout=<secs>
-
-
- Forces the PINN interface to be entered on startup (as if the shift key had been pressed). This is very useful when using a VNC connection.
強制在啟動時進入 PINN 介面（如同按下 Shift 鍵）。這在使用 VNC 連線時非常有用。
- forcetrigger
- forcetrigger
-
-
- Forces Recovery Mode to be entered on boot if GPIO pin 3 on header P1 is connected to GND (pin 25).
如果 GPIO 標頭 P1 上的 pin3 連線到 GND (pin25)，就強制在開機時進入復原模式。
- gpiotriggerenable
- gpiotriggerenable
-
-
- This setting allows the network timeout to be specified in seconds, especially for networks that take longer to establish.
這個設定讓網路逾時可使用秒指定，對需要較長時間辨識的網路尤為有用。
- networktimeout=<secs>
- networktimeout=<secs>
-
-
- Prevents a SHIFT keypress from entering Recovery Mode on boot (maybe you have a problematic keyboard which is erroneously triggering every time you boot)
避免在開機時按下 Shift 鍵進入復原模式（也許您有個有問題的鍵盤，會在您每次開機時錯誤觸發）
- keyboardtriggerenable
- keyboardtriggerenable
-
-
- Interface
介面
- Uses a VNC network connection to control PINN instead of any locally attached keyboard, mouse and display. When this is used, any local display will remain blank.
使用 VNC 網路連線以控制 PINN 而非任何本機連線的鍵盤、滑鼠與顯示器。當使用此選項時，任何本機的顯示器都會保持為空白。
-
- vncinstall
- vncinstall
-
- Uses a VNC network connection to control PINN. However, unlike vncinstall, any locally attached keyboard and mouse will still be active and the display will be duplicated to the local screen and the VNC connection.
使用 VNC 網路連線控制 PINN。但不像 vncinstall，任何本機連線的鍵盤與滑鼠都還是可以使用，而顯示畫面也會在本機螢幕與 VNC 連線上同步顯示。
- vncshare
- vncshare
-
-
- Enables an SSH connection to the rescueshell in PINN. It cannot be used to control PINN, but having a shell is very useful to perform remote maintenance on any of the SD card partitions
啟用到 PINN 中的緊急殼層的 SSH 連線。這對控制 PINN 沒什麼用，但在執行對任何 SD 記憶卡分割區的遠端維護時相當有用
- ssh
- ssh
-
-
- This option causes a local command shell to be opened when PINN is booted. When the shell is exited, PINN will then be booted as normal.
此選項會在 PINN 開機時開啟本機殼層。當殼層存在時，PINN 將會正常開機。
- rescueshell
- rescueshell
-
-
- Prevents safemode being entered if you have external hardware that pulls pin 5 low.
如果您有外部硬體將 pin 5 拉低，避免進入安全模式。
- disablesafemode
- disablesafemode
-
-
- A special boot feature to swap the priority of the DSI and HDMI video outputs, allowing an OS to give priority to a HDMI screen if attached.
交換 DSI 與 HDMI 視訊輸入的特殊開機功能，讓作業系統可以在 HDMI 螢幕連線時較高的優先權。
- dsi
- dsi
-
-
- Prevents the list of OSes from being grouped into categories.
避免將作業系統清單加入到分類中。
- no_group
- no_group
-
-
- Prevents the cursor from being shown on the boot selection dialog (requested for touchscreen devices)
避免在開機選取對話框時顯示游標（對觸控螢幕有用）
- no_cursor
- no_cursor
-
-
- Causes a customised wallpaper.jpg or wallpaper.png file to be resized to fill the entire desktop
使用自訂的 wallpaper.jpg 或 wallpaper.png 檔案調整大小到填滿整個桌面
- wallpaper_resize
- wallpaper_resize
-
-
- Sets one of 4 simple display modes: 0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
設定四個簡易顯示模式其中之一：0=HDMI preferred, 1=HDMI safe, 2= PAL 4:3, 3=NTSC 4:3
- display=
- display=
-
-
- Changes the style of the windows
變更視窗樣式
- style=
- style=
-
-
- Changes the default timeout allowed before an OS is booted without any selection.
變更沒有選取作業系統時在開機選單允許的逾時。
-
- bootmenutimeout=<secs>
- bootmenutimeout=<secs>
-
- To change the background colour for the screen and most windows, add background=r,g,b, where 0,0,0 is black and 255,255,255 is white. I suggest to use values above 127.
要變更畫面與大多數視窗的背景色彩，新增 background=r,g,b，0,0,0 是黑色，而 255,255,255 是白色。我建議使用 127 以上的值。
- background=<r,g,b>
- background=<r,g,b>
+ &configpath=
+
- &runinstaller
+
+
+ no_&update
+
+
+ &forceupdatepinn
+
+
+ nofirm&ware
+
+
+ &allsd
+
+
+ all&usb
+
+
+ all&network
+
+
+ all&installed
+
+
+ &waitsd
+
+
+ waitus&b
+
+
+ waitnetwor&k
+
+
+ waita&ll
+
+
+ sil&entreinstallnewer
+
+
+ &silentinstall
+
+
+ selec&t=
+
+
+ no_&default_source
+
+
+ disable&usbimages
+
+
+ disable&sdimages
+
+
+ &showall
+
+
+ repo_&list=
+
+
+ &repo=
+
+
+ alt_&image_source=
+
+
+ &remotetimeout=<secs>
+
+
+ &forcetrigger
+
+
+ &gpiotriggerenable
+
+
+ &networktimeout=<secs>
+
+
+ &keyboardtriggerenable
+
+
+ v&ncinstall
+
+
+ &vncshare
+
+
+ &ssh
+
+
+ &rescueshell
+
+
+ disablesafe&mode
+
+
+ &dsi
+
+
+ no_&group
+
+
+ no_&cursor
+
+
+ &wallpaper_resize
+
+
+ dis&play=
+
+
+ s&tyle=
+
+
+ b&ootmenutimeout=<secs>
+
+
+ &background=<r,g,b>
+
+
+ none
無
- 0
0
- 1
1
- 2
2
- 3
3
- windows
windows
- motif
motif
- platinum
platinum
@@ -2186,22 +2203,22 @@ Are you sure?
ProgressSlideshowDialog
- %1 MB of %2 MB read (%3 MB/sec) Remaining: %4:%5:%6
%2 MB 中的 %1 MB 已讀取（%3 MB/秒）剩餘：%4:%5:%6
- %1 MB of %2 MB written (%3 MB/sec) Remaining: %4:%5:%6
%1 MB 在 %2 MB 中已寫入（%3 MB/秒）剩餘：%4:%5:%6
- %1 MB read (%2 MB/sec)
%1 MB 已讀取（%2 MB/秒）
- %1 MB written (%2 MB/sec)
%1 MB 已寫入（%2 MB／秒）
@@ -2330,37 +2347,37 @@ Are you sure?
未提供 wifi 介面
- Authenticated but still waiting for DHCP lease
驗證完全，但仍在等待 DHCP 租約
- Connecting to wifi failed
連線至 wifi 失敗
- Connecting to the wifi access point failed. Check your password
連線到 wifi 存取點失敗。檢查您的密碼
- Cancel
取消
- Releasing old DHCP lease
正在釋放舊的 DHCP 租約
- Disconnecting
斷線
- Connecting
連線
diff --git a/recovery/util.cpp b/recovery/util.cpp
index c59901b8..59a8fba1 100644
--- a/recovery/util.cpp
+++ b/recovery/util.cpp
@@ -571,7 +571,7 @@ QString getDescription(const QString &folder, const QString &flavour)
bool updatePartitionScript(QVariantMap & entry, QListWidgetItem * witem)
{ //Entry.value("supports_backup").toString() == "update"
- MYDEBUG
+ TRACE
/*
* Read local partition_setup.sh in /settings/os/os_name
* If 2nd line contains "backup supported"
diff --git a/recovery/wifisettingsdialog.cpp b/recovery/wifisettingsdialog.cpp
index 386c8e83..b82a3865 100644
--- a/recovery/wifisettingsdialog.cpp
+++ b/recovery/wifisettingsdialog.cpp
@@ -186,13 +186,14 @@ void WifiSettingsDialog::on_list_currentItemChanged(QListWidgetItem *current)
ui->userLabel->setEnabled(supportsEAP);
ui->userEdit->setEnabled(supportsEAP);
- if (ui->passwordRadio->isChecked())
+/* if (ui->passwordRadio->isChecked())
{
if (supportsEAP)
ui->userEdit->setFocus();
else
ui->passwordEdit->setFocus();
}
+*/
}
else
{
diff --git a/updatethread.cpp b/updatethread.cpp
deleted file mode 100644
index 689cc681..00000000
--- a/updatethread.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "updatethread.h"
-
-#include
-#include
-#include
-
-updateThread::updateThread(QObject *parent) :
- QThread(parent)
-{
-
-}
-
-void updateThread::doDownload(QString src, QString dst)
-{
- _src=src;
- _dst=dst;
-}
-
-void updateThread::run()
-{
- downloading = 1;
- QString result="rsync -ax "+QString(_src)+"/. "+QString(_dst)+"/.";
- QProcess::execute (result);
- downloading = 0;
- emit resultReady("DONE "+result);
-}
-
diff --git a/updatethread.h b/updatethread.h
deleted file mode 100644
index d63f7f3e..00000000
--- a/updatethread.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef UPDATETHREAD_H
-#define UPDATETHREAD_H
-
-#include
-#include
-
-extern int downloading;
-
-class updateThread : public QThread
-{
- Q_OBJECT
-public:
- explicit updateThread(QObject *parent = 0);
-
-protected:
- virtual void run();
-
-signals:
- void resultReady(const QString &s);
-
-public slots:
- void doDownload(QString src, QString dst);
-
-private:
- QString _src;
- QString _dst;
-};
-
-#endif // UPDATETHREAD_H