Update italian translation, bsdtar instructions, Reinstall bugfix for…

… partuuid
procount · May 12, 2018 · 136fa4a · 136fa4a
1 parent 05204bc
commit 136fa4a
Show file tree

Hide file tree

Showing 28 changed files with 1,032 additions and 1,083 deletions.
diff --git a/README.md b/README.md
diff --git a/README_PINN.md b/README_PINN.md
@@ -7,7 +7,7 @@ The latest version of [PINN](http://downloads.sourceforge.net/projects/pinn/pinn
 
 ### - [If you have PINN v2.4.3 - v2.4.4b installed, please manually update to v2.4.4c](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=142574&start=200#p1239359)
 
-This README relates to v2.8.1
+This README relates to v2.8.2
 
 <sup>(PINN is only available in one format that 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`)</sup>
 
@@ -873,6 +873,18 @@ 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`

diff --git a/README_SUM.md b/README_SUM.md
@@ -45,6 +45,10 @@ Please note that in some cases it may extract the files into a folder, if this i
 
 ## Change History
 
+### V2.8.2
+
+- **Reinstall**        - bugfix to Reinstall option following partuuid change on USBs
+
 ### V2.8.1
 
 - **Programmable CEC** - Program your TV remote for use with PINN

diff --git a/changes.md b/changes.md
@@ -378,4 +378,7 @@ Fixes the incorrect recovery.cmdline bug in v2.5.2.
 
 - **Programmable CEC** - Program your TV remote for use with PINN
 
+### V2.8.2
+
+- **Reinstall**        - bugfix to Reinstall option following partuuid change on USBs
 
diff --git a/history.md b/history.md
@@ -5,6 +5,10 @@ PINN is a version of the NOOBS Operating System Installer for the Raspberry Pi w
 
 ## Change History
 
+### V2.8.2
+
+- **Reinstall**        - bugfix to Reinstall option following partuuid change on USBs
+
 ### V2.8.1
 
 - **Programmable CEC** - Program your TV remote for use with PINN

diff --git a/recovery/config.h b/recovery/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8.1"
+#define VERSION_NUMBER "2.8.2"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white

diff --git a/recovery/multiimagewritethread.cpp b/recovery/multiimagewritethread.cpp
@@ -354,6 +354,12 @@ void MultiImageWriteThread::run()
                 uint compressedSize = partition->uncompressedTarballSize(); //in MB
                 totaluncompressedsize += compressedSize;
 
+                if (partition->partitionDevice().contains("PARTUUID"))
+                {
+                    QByteArray pdev = getDevice(partition->partitionDevice());
+                    partition->setPartitionDevice(pdev);
+                }
+
                 uint partitionSectors = getFileContents(sysclassblock(partition->partitionDevice())+"/size").trimmed().toUInt();
                 if (compressedSize*2048 > partitionSectors)
                 {

diff --git a/recovery/translation_ae.ts b/recovery/translation_ae.ts
@@ -999,36 +999,36 @@ Booting this drive again will re-instate PINN&apos;s partition structure.</sourc
         <translation>ليس بما فيه الكفاية سعة قرص. بحاجة %1 م ب، أصبح %2 م ب</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="381"/>
+        <location filename="multiimagewritethread.cpp" line="387"/>
         <source>Finish writing (sync)</source>
         <translation>إنهاء الكتابة (مزامنة)</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="616"/>
+        <location filename="multiimagewritethread.cpp" line="622"/>
         <source>File &apos;%1&apos; does not exist</source>
         <translation>الملف &apos;%1 &apos; غير موجود</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="645"/>
         <location filename="multiimagewritethread.cpp" line="651"/>
+        <location filename="multiimagewritethread.cpp" line="657"/>
         <source>%1: Writing OS image</source>
         <translation>%1: كتابه صوره نظام التشغيل</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="665"/>
+        <location filename="multiimagewritethread.cpp" line="671"/>
         <source>%1: Mounting file system</source>
         <translation>%1: نظام الملفات المتصاعد</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="668"/>
-        <location filename="multiimagewritethread.cpp" line="692"/>
-        <location filename="multiimagewritethread.cpp" line="820"/>
-        <location filename="multiimagewritethread.cpp" line="945"/>
+        <location filename="multiimagewritethread.cpp" line="674"/>
+        <location filename="multiimagewritethread.cpp" line="698"/>
+        <location filename="multiimagewritethread.cpp" line="826"/>
+        <location filename="multiimagewritethread.cpp" line="951"/>
         <source>%1: Error mounting file system</source>
         <translation>%1: خطا في تركيب نظام الملفات</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="658"/>
+        <location filename="multiimagewritethread.cpp" line="664"/>
         <source>%1: Creating filesystem (%2)</source>
         <translation>%1: إنشاء ملفات الخادم (%2)</translation>
     </message>
@@ -1079,105 +1079,105 @@ Booting this drive again will re-instate PINN&apos;s partition structure.</sourc
         <translation>بدء تشغيل كل قسم</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="361"/>
+        <location filename="multiimagewritethread.cpp" line="367"/>
         <source>Cannot Reinstall </source>
         <oldsource>Cannot Refresh </oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="361"/>
+        <location filename="multiimagewritethread.cpp" line="367"/>
         <source>.
 Partition not big enough for new image.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="401"/>
+        <location filename="multiimagewritethread.cpp" line="407"/>
         <source>Error reading existing partition table</source>
         <translation>خطا في قراءه جدول الأقسام الموجود</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="486"/>
+        <location filename="multiimagewritethread.cpp" line="492"/>
         <source>Error creating partition table</source>
         <translation>خطا في إنشاء جدول الأقسام</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="673"/>
+        <location filename="multiimagewritethread.cpp" line="679"/>
         <source>%1: Downloading and extracting filesystem</source>
         <translation>%1: تحميل الملفات واستخراجها</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="675"/>
+        <location filename="multiimagewritethread.cpp" line="681"/>
         <source>%1: Extracting filesystem</source>
         <translation>%1: استخراج الملفات</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="689"/>
-        <location filename="multiimagewritethread.cpp" line="816"/>
+        <location filename="multiimagewritethread.cpp" line="695"/>
+        <location filename="multiimagewritethread.cpp" line="822"/>
         <source>%1: Mounting FAT partition</source>
         <translation>%1: تركيب قسم FAT</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="697"/>
+        <location filename="multiimagewritethread.cpp" line="703"/>
         <source>%1: Creating os_config.json</source>
         <translation>%1: انشاء os_config.json</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="727"/>
+        <location filename="multiimagewritethread.cpp" line="733"/>
         <source>%1: Saving display mode to config.txt</source>
         <translation>%1: حفظ وضع العرض إلى config.txt</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="738"/>
+        <location filename="multiimagewritethread.cpp" line="744"/>
         <source>%1: Running partition setup script</source>
         <translation>%1:تشغيل البرنامج النصي لإعداد القسم</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="787"/>
+        <location filename="multiimagewritethread.cpp" line="793"/>
         <source>%1: Error executing partition setup script</source>
         <translation>%1:حدث خطأ أثناء تنفيذ البرنامج النصي لإعداد القسم</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="803"/>
+        <location filename="multiimagewritethread.cpp" line="809"/>
         <source>%1: Configuring flavour</source>
         <translation>%1: تكوين نكهة</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="793"/>
-        <location filename="multiimagewritethread.cpp" line="854"/>
+        <location filename="multiimagewritethread.cpp" line="799"/>
+        <location filename="multiimagewritethread.cpp" line="860"/>
         <source>%1: Unmounting FAT partition</source>
         <translation>%1: إلغاء تحميل القسم FAT</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="796"/>
-        <location filename="multiimagewritethread.cpp" line="857"/>
+        <location filename="multiimagewritethread.cpp" line="802"/>
+        <location filename="multiimagewritethread.cpp" line="863"/>
         <source>%1: Error unmounting</source>
         <translation>%1:خطا في إلغاء التركيب</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="826"/>
+        <location filename="multiimagewritethread.cpp" line="832"/>
         <source>%1: Checking firmware update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="1228"/>
+        <location filename="multiimagewritethread.cpp" line="1234"/>
         <source>Error creating file system</source>
         <translation>خطا في إنشاء نظام الملفات</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="1292"/>
-        <location filename="multiimagewritethread.cpp" line="1364"/>
-        <location filename="multiimagewritethread.cpp" line="1423"/>
+        <location filename="multiimagewritethread.cpp" line="1298"/>
+        <location filename="multiimagewritethread.cpp" line="1370"/>
+        <location filename="multiimagewritethread.cpp" line="1429"/>
         <source>Unknown compression format file extension. Expecting .lzo, .gz, .xz, .bz2 or .zip</source>
         <translation>ملحق ملف تنسيق الضغط غير معروف. تتوقع  .lzo, .gz, .xz, .bz2 or .zip</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="1326"/>
+        <location filename="multiimagewritethread.cpp" line="1332"/>
         <source>Error downloading or extracting tarball</source>
         <translation>خطا في تنزيل الكره أو استخراجها</translation>
     </message>
     <message>
-        <location filename="multiimagewritethread.cpp" line="1385"/>
-        <location filename="multiimagewritethread.cpp" line="1444"/>
+        <location filename="multiimagewritethread.cpp" line="1391"/>
+        <location filename="multiimagewritethread.cpp" line="1450"/>
         <source>Error downloading or writing OS to SD card</source>
         <translation>خطأ في تحميل أو كتابة نظام التشغيل إلى بطاقة SD </translation>
     </message>