summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 16:20:57 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-16 16:20:57 -0200
commit7cfc5f8de24253a85029a0eaf76b432116a60791 (patch)
tree9cc81911f4864e7205977e1cca7fc8ce5ff252b5 /libre
parentff6c8caa93bdb42c5a9020a1a8e719d909d055ec (diff)
downloadabslibre-7cfc5f8de24253a85029a0eaf76b432116a60791.tar.gz
abslibre-7cfc5f8de24253a85029a0eaf76b432116a60791.tar.bz2
abslibre-7cfc5f8de24253a85029a0eaf76b432116a60791.zip
virtualbox-libre-4.2.0-4: adding note for virtual machine installation
Diffstat (limited to 'libre')
-rwxr-xr-xlibre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/free-distros.patch208
2 files changed, 208 insertions, 2 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 81ba99ec8..27453834d 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -109,7 +109,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'67cc4c8611890038eb3e4114ae899525'
- '1ede8951f4bebac3b50a8e0b999aa348')
+ '8b2707d4e99b8a4f862e87607845d22f')
#_extramodules=extramodules-3.5-LIBRE
#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 223aeeb16..ef81243e5 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -500,7 +500,7 @@
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-04 01:54:14.693582889 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-15 22:30:16.982062202 -0200
@@ -44,45 +44,45 @@
static const osTypePattern gs_OSTypePattern[] =
@@ -650,6 +650,21 @@
{ QRegExp("Ot", Qt::CaseInsensitive), "Other" },
};
+@@ -266,10 +291,12 @@
+ setTitle(UIWizardNewVM::tr("Name and operating system"));
+
+ /* Translate widgets: */
+- m_pLabel->setText(UIWizardNewVM::tr("Please choose a descriptive name for the new virtual machine "
++ m_pLabel->setText(UIWizardNewVM::tr("<p>Please choose a descriptive name for the new virtual machine "
+ "and select the type of operating system you intend to install on it. "
+ "The name you choose will be used throughout VirtualBox "
+- "to identify this machine."));
++ "to identify this machine.</p><p><b>Note: We hope you don't use non-free "
++ "GNU/Linux distros and non-free operating systems, since to use them "
++ "is to surrender your freedom.</b></p>"));
+ }
+
+ void UIWizardNewVMPageBasic1::initializePage()
--- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300
+++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300
@@ -3405,7 +3405,18 @@
@@ -996,3 +1011,194 @@
#endif /* VBOX_WITH_VIDEOHWACCEL */
#ifdef VBOX_WITH_CRHGSMI
/* Check if WDDM mode supported by the guest OS type: */
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts 2012-10-16 00:13:25.992465184 -0200
+@@ -9065,8 +9065,8 @@
+ <translation>Име и операционна система</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Моля, изберете описателно име за новата виртуална машина и изберете типа на операционната система, която планирате да инсталирате в нея. Името, което изберете, ще се използва от VirtualBox за разпознаване на тази машина.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: 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.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Моля, изберете описателно име за новата виртуална машина и изберете типа на операционната система, която планирате да инсталирате в нея. Името, което изберете, ще се използва от VirtualBox за разпознаване на тази машина.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts 2012-10-16 13:48:43.077565860 -0200
+@@ -9732,8 +9732,8 @@
+ <translation>Název a operační systém</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Zvolte prosím výstižný název pro nový virtuální počítač a vyberte typ operačního systému, který do něj budete instalovat. Zvolený název bude následně aplikací VirtualBox používán pro identifikaci tohoto počítače.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Zvolte prosím výstižný název pro nový virtuální počítač a vyberte typ operačního systému, který do něj budete instalovat. Zvolený název bude následně aplikací VirtualBox používán pro identifikaci tohoto počítače.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts 2012-09-13 05:26:18.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts 2012-10-16 13:52:23.322043944 -0200
+@@ -5837,8 +5837,8 @@
+ <translation>Name und Betriebssystem</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Bitte wählen Sie einen angemessenen Namen für die neue virtuelle Maschine und wählen Sie den Typ des Betriebssystems, das Sie installieren möchten. Der gewählte Name wird zur Identifizierung dieser Maschine verwendet.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Bitte wählen Sie einen angemessenen Namen für die neue virtuelle Maschine und wählen Sie den Typ des Betriebssystems, das Sie installieren möchten. Der gewählte Name wird zur Identifizierung dieser Maschine verwendet.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts 2012-10-16 13:59:29.357639018 -0200
+@@ -9578,8 +9578,8 @@
+ <translation>Nombre y sistema operativo</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Seleccione un nombre descriptivo para la nueva máquina virtual y seleccione el tipo de sistema operativo que tiene intención de instalar en ella. El nombre que seleccione será usado por VirtualBox para identificar esta máquina.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Seleccione un nombre descriptivo para la nueva máquina virtual y seleccione el tipo de sistema operativo que tiene intención de instalar en ella. El nombre que seleccione será usado por VirtualBox para identificar esta máquina.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota: Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts 2012-09-08 06:36:08.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts 2012-10-16 14:05:28.901905114 -0200
+@@ -9505,8 +9505,8 @@
+ <translation>Név és operációs rendszer</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Adj meg egy leíró nevet az új virtuális géphez és válaszd ki a telepíteni kívánt operációs rendszír típusát. A választott névvel lesz azonosítva a gép a VirtualBoxban.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Adj meg egy leíró nevet az új virtuális géphez és válaszd ki a telepíteni kívánt operációs rendszír típusát. A választott névvel lesz azonosítva a gép a VirtualBoxban.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts 2012-10-16 14:09:15.132822795 -0200
+@@ -10164,8 +10164,8 @@
+ <translation>Nome e sistema operativo</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Scegli un nome descrittivo per la nuova macchina virtuale e seleziona il tipo di sistema operativo che desideri installare. Il nome che scegli sarà utilizzato da VirtualBox per identificare questa macchina.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Scegli un nome descrittivo per la nuova macchina virtuale e seleziona il tipo di sistema operativo che desideri installare. Il nome che scegli sarà utilizzato da VirtualBox per identificare questa macchina.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts 2012-09-08 06:36:08.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts 2012-10-16 14:12:46.698999485 -0200
+@@ -10874,8 +10874,8 @@
+ </message>
+ <message>
+ <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic1.cpp" line="269"/>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>新しい仮想マシンの記述名を指定し、インストールするオペレーティングシステムのタイプを選択してください。入力した名前はVirtualBoxでこのマシンを特定するのに使われます。</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;新しい仮想マシンの記述名を指定し、インストールするオペレーティングシステムのタイプを選択してください。入力した名前はVirtualBoxでこのマシンを特定するのに使われます。&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <location filename="../src/wizards/newvm/UIWizardNewVMPageBasic2.cpp" line="129"/>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts 2012-10-16 14:15:54.360627673 -0200
+@@ -9120,8 +9120,8 @@
+ <translation>이름 및 운영 체제</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>새 가상 머신을 나타내는 이름을 입력하고 설치할 운영 체제를 선택하십시오. 입력한 이름은 VirtualBox에서 가상 머신을 식별하는 데 사용됩니다.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;새 가상 머신을 나타내는 이름을 입력하고 설치할 운영 체제를 선택하십시오. 입력한 이름은 VirtualBox에서 가상 머신을 식별하는 데 사용됩니다.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts 2012-10-16 14:18:48.962964625 -0200
+@@ -7241,8 +7241,8 @@
+ <translation>Naam en besturingssysteem</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Kies een herkenbare naam voor de nieuwe virtuele machine en selecteer het type besturingssysteem dat u erop wilt installeren. De naam die u kiest zal binnen VirtualBox gebruikt worden om deze machine te identificeren.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Kies een herkenbare naam voor de nieuwe virtuele machine en selecteer het type besturingssysteem dat u erop wilt installeren. De naam die u kiest zal binnen VirtualBox gebruikt worden om deze machine te identificeren.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts 2012-10-16 14:21:26.059420850 -0200
+@@ -10180,8 +10180,8 @@
+ <translation>Nome e Sistema Operacional</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Escolha um nome descritivo para a nova máquina virtual e selecione o tipo de sistema operacional que você pretende instalar nela. O nome que você escolher será utilizado pelo VirtualBox para identificar esta máquina.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Escolha um nome descritivo para a nova máquina virtual e selecione o tipo de sistema operacional que você pretende instalar nela. O nome que você escolher será utilizado pelo VirtualBox para identificar esta máquina.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso: Esperamos que não se usem distros não livres de GNU/Linux e sistemas operacionais não livres, pois ao usá-los abre-se mão de sua liberdade.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts 2012-09-13 05:26:18.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts 2012-10-16 14:24:13.128882291 -0200
+@@ -9221,8 +9221,8 @@
+ <translation>Укажите имя и тип ОС</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>Пожалуйста введите имя новой виртуальной машины и выберите тип операционной системы, которую Вы собираетесь установить на данную машину. Заданное Вами имя будет использоваться для идентификации данной машины.</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;Пожалуйста введите имя новой виртуальной машины и выберите тип операционной системы, которую Вы собираетесь установить на данную машину. Заданное Вами имя будет использоваться для идентификации данной машины.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts 2012-10-16 14:31:55.985969428 -0200
+@@ -9058,7 +9058,7 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts 2012-10-16 14:35:52.321589511 -0200
+@@ -5832,7 +5832,7 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts 2012-10-16 14:39:00.340417942 -0200
+@@ -7217,8 +7217,8 @@
+ <translation>虚拟电脑名称和系统类型</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>请选择新虚拟电脑的描述名称及要安装的操作系统类型。此名称将用于标识此虚拟电脑。</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;请选择新虚拟电脑的描述名称及要安装的操作系统类型。此名称将用于标识此虚拟电脑。&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts 2012-09-08 06:36:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts 2012-10-16 14:42:12.176147258 -0200
+@@ -5836,8 +5836,8 @@
+ <translation>名稱和作業系統</translation>
+ </message>
+ <message>
+- <source>Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.</source>
+- <translation>請選擇新虛擬機器的描述性名稱,並選取您打算在其上安裝的作業系統類型。 VirtualBox 將使用整個選擇的名稱來識別此機器。</translation>
++ <source>&lt;p&gt;Please choose a descriptive name for the new virtual machine and select the type of operating system you intend to install on it. The name you choose will be used throughout VirtualBox to identify this machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</source>
++ <translation>&lt;p&gt;請選擇新虛擬機器的描述性名稱,並選取您打算在其上安裝的作業系統類型。 VirtualBox 將使用整個選擇的名稱來識別此機器。&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note: We hope you don't use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.&lt;/b&gt;&lt;/p&gt;</translation>
+ </message>
+ <message>
+ <source>Memory size</source>