Fixing merge issue in fddb5a032b

This commit is contained in:
Gabor Apati-Nagy 2015-02-04 17:23:51 +00:00
parent 8765998590
commit 572227faa5

View File

@ -7650,6 +7650,12 @@ When you configure an NFS storage repository, you simply provide the hostname or
<data name="NEWVMWIZARD_CDMEDIAPAGE_TITLE" xml:space="preserve"> <data name="NEWVMWIZARD_CDMEDIAPAGE_TITLE" xml:space="preserve">
<value>Locate the operating system installation media</value> <value>Locate the operating system installation media</value>
</data> </data>
<data name="NEWVMWIZARD_CLOUD_CONFIG_PARAMETERS_PAGE" xml:space="preserve">
<value>Cloud-Config Parameters</value>
</data>
<data name="NEWVMWIZARD_CLOUD_CONFIG_PARAMETERS_PAGE_TITLE" xml:space="preserve">
<value>Configure Cloud-Config Parameters</value>
</data>
<data name="NEWVMWIZARD_COPY_BIOS_STRINGS_PAGE_HOST" xml:space="preserve"> <data name="NEWVMWIZARD_COPY_BIOS_STRINGS_PAGE_HOST" xml:space="preserve">
<value>Copy BIOS Strings from</value> <value>Copy BIOS Strings from</value>
</data> </data>
@ -7820,6 +7826,9 @@ Review these settings, then click Previous if you need to change anything. Other
<data name="NEWVMWIZARD_TEMPLATEPAGE_CITRIX" xml:space="preserve"> <data name="NEWVMWIZARD_TEMPLATEPAGE_CITRIX" xml:space="preserve">
<value>Citrix</value> <value>Citrix</value>
</data> </data>
<data name="NEWVMWIZARD_TEMPLATEPAGE_COREOS" xml:space="preserve">
<value>CoreOS</value>
</data>
<data name="NEWVMWIZARD_TEMPLATEPAGE_CUSTOM" xml:space="preserve"> <data name="NEWVMWIZARD_TEMPLATEPAGE_CUSTOM" xml:space="preserve">
<value>Custom</value> <value>Custom</value>
</data> </data>