virtualbox-libre-4.2.6-1: updating free-distros.patch

1 files changed, 12 insertions, 11 deletions

diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index db6774542..8004ee99a 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -502,10 +502,10 @@ index 6ae0372..df65e60 100644
          1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
 diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index 4c52fb0..fbccfaf 100644
+index c5a4cfe..b3e0247 100644
 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
 +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,45 +44,33 @@ struct osTypePattern
+@@ -44,46 +44,33 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
@@ -523,6 +523,7 @@ index 4c52fb0..fbccfaf 100644
 -    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
 -    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
 -    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+-    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
 -    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
 -    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
 -    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -578,7 +579,7 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
      { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
      { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
      { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
  
@@ -587,7 +588,7 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
      { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
      { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
      { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
      { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -646,27 +647,27 @@ index 4c52fb0..fbccfaf 100644
      { QRegExp("L4", Qt::CaseInsensitive), "L4" },
      { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
      { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
      { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
      { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
      { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+    
++
 +    /* Other: */
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
-@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
      /* Create widgets: */
      QVBoxLayout *pMainLayout = new QVBoxLayout(this);
      {
 +        pMainLayout->setContentsMargins(8, 6, 8, 6);
          m_pLabel = new QIRichTextLabel(this);
-+	m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
++        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
          m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
 -        pMainLayout->addWidget(m_pLabel);
 -        pMainLayout->addWidget(m_pNameAndSystemEditor);
 -        pMainLayout->addStretch();
-+	m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
++        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 +        pMainLayout->addWidget(m_pLabel, 1);
 +        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
      }
@@ -1393,10 +1394,10 @@ index 275e1e6..34171eb 100644
  <context>
      <name>UINetworkManagerDialog</name>
 diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index fcaed77..ab92ef9 100644
+index f902373..625da36 100644
 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
 +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4830,6 +4830,10 @@
+@@ -4850,6 +4850,10 @@
        <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
        <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
      </message>