summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre/free-distros.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/virtualbox-libre/free-distros.patch')
-rw-r--r--libre/virtualbox-libre/free-distros.patch44
1 files changed, 23 insertions, 21 deletions
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index db6774542..91d15e380 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..7d2b363 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,51 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -624,6 +625,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" },
@@ -646,27 +648,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 +160,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 +256,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);
}
@@ -719,10 +721,10 @@ index 9a31a4c..7db11ad 100644
</xsl:attribute>
<xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-index 075f097..3d311e1 100644
+index 4523dad..38ae21a 100644
--- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-@@ -70,6 +70,24 @@
+@@ -71,6 +71,24 @@
<file alias="os_oracle_64.png">images/os_oracle_64.png</file>
<file alias="os_macosx.png">images/os_macosx.png</file>
<file alias="os_macosx_64.png">images/os_macosx_64.png</file>
@@ -748,10 +750,10 @@ index 075f097..3d311e1 100644
<file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
<file alias="hd_32px.png">images/hd_32px.png</file>
diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-index ec404df..c09e3b1 100644
+index 8af9597..39a8d39 100644
--- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-@@ -4334,11 +4334,11 @@ void VBoxGlobal::init()
+@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
{"OS2Warp45", ":/os_os2warp45.png"},
{"OS2eCS", ":/os_os2ecs.png"},
{"OS2", ":/os_os2_other.png"},
@@ -768,7 +770,7 @@ index ec404df..c09e3b1 100644
{"ArchLinux", ":/os_archlinux.png"},
{"ArchLinux_64", ":/os_archlinux_64.png"},
{"Debian", ":/os_debian.png"},
-@@ -4361,7 +4361,7 @@ void VBoxGlobal::init()
+@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
{"Xandros_64", ":/os_xandros_64.png"},
{"Oracle", ":/os_oracle.png"},
{"Oracle_64", ":/os_oracle_64.png"},
@@ -777,7 +779,7 @@ index ec404df..c09e3b1 100644
{"FreeBSD", ":/os_freebsd.png"},
{"FreeBSD_64", ":/os_freebsd_64.png"},
{"OpenBSD", ":/os_openbsd.png"},
-@@ -4377,6 +4377,25 @@ void VBoxGlobal::init()
+@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
{"MacOS", ":/os_macosx.png"},
{"MacOS_64", ":/os_macosx_64.png"},
{"JRockitVE", ":/os_jrockitve.png"},
@@ -1393,19 +1395,19 @@ 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 @@
- <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
- <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
+@@ -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>
+ <message>
+ <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
+ <translation type="unfinished"></translation>
+ </message>
- </context>
- <context>
+ </context>
+ <context>
<name>UINetworkManagerDialog</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
index 3f31f8f..9248344 100644
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-06 01:04:15 +0000