Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-24 16:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Steve 2019-11-08 10:45:19 -05:00
commit fc5f2c2090
23 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CloverApp/Clover/Installer/Installer.swift
View File

@ -726,7 +726,7 @@ class InstallerViewController: NSViewController {
let psm : String = getPartitionSchemeMap(from: disk) ?? kNotAvailable.locale
let name : String = getVolumeName(from: disk) ?? kNotAvailable.locale
let mp : String = getMountPoint(from: disk) ?? kNotAvailable.locale
if fs == "fat32" || fs == "exfat" || fs == "hfs" {
if fs == "msdos" || fs == "fat32" || fs == "exfat" || fs == "hfs" {
self.targetPop.addItem(withTitle: "\(disk)\t\(name), mount point: \(mp), \(fs.uppercased()), \(psm)")
self.targetPop.invalidateIntrinsicContentSize()
// get the image

4
CloverApp/Lang.bundle/Contents/Resources/de.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/en.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/es.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/fr.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/hr.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/id.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/it.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Installa Clover";
"Current Clover revision" = "Revisione corrente";
"Boot device" = "Boot Device";
@ -127,7 +127,7 @@ Usare con cautela!";
"DataHubDxe.efi" = "Aggiunge supporto al protocollo DataHub necessario per MacOSX.
Questo protocollo è già presente nella maggior parte dei casi, ma può mancare in determinate configurazioni. In questo caso si dovrebbe ricevere un avviso sullo schermo.";
"EmuVariableUefi.UEFI_description" = "Driver per il supporto delle variabili NVRAM necessarie per MacOSX.
"EmuVariableUefi.efi" = "Driver per il supporto delle variabili NVRAM necessarie per MacOSX.
La maggior parte dei firmware UEFI utilizzano hardware NVRAM, ma in rari casi è necessario il driver.
Usare solo se si ha un problema senza di questo driver.";

4
CloverApp/Lang.bundle/Contents/Resources/ja.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/ko.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/lv.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/nl.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/pl.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/pt-BR.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/pt-PT.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/ro.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

2
CloverApp/Lang.bundle/Contents/Resources/ru.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "Н/Д"; // not available
"N/A" = "Н/Д"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";

4
CloverApp/Lang.bundle/Contents/Resources/tr.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/uk.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

4
CloverApp/Lang.bundle/Contents/Resources/vi.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

9
CloverApp/Lang.bundle/Contents/Resources/zh-Hans.strings
View File

@ -11,16 +11,16 @@
*/
/* top bar menu */
"N/A" = "N/A"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "安装 Clover";
"Current Clover revision" = "目前 Clover 版本";
"Boot device" = "引导设备";
"config path:" = "config 路径:";
"Clover wants to mount %@" = "Clover 想要挂载 %@";
"Clover wants to umount %@" = "Clover 想要解除挂载 %@";
"Clover wants to umount %@" = "Clover 想要卸载 %@";
"Mount" = "挂载";
"umount" = "解除挂载";
"umount" = "卸载";
"mount point" = "挂载点";
"true" = "是";
@ -73,6 +73,7 @@
"BIOS/HID" = "BIOS, 人机接口设备";
"UEFI/FileVault2" = "UEFI, 文件保险箱驱动";
"BIOS/FileVault2" = "BIOS, 文件保险箱驱动";
"UEFI/MemoryFix" = "UEFI, 内存修正驱动";
@ -124,7 +125,7 @@
"DataHubDxe.efi" = "此驱动 提供 DataHub 协议支持, macOS 强制启用。
通常已启用, 但有时可能遗漏。可在屏幕 warning 中查看。";
"EmuVariableUefi.UEFI_description" = "存储 非 UEFI-引导 中 UEFI 变量 的替代方法。
"EmuVariableUefi.efi" = "存储 非 UEFI-引导 中 UEFI 变量 的替代方法。
绝大多数 UEFI 引导使用的是 硬件 NVRAM 但在一些特殊情况下需要这个驱动。如果缺少这个驱动会遇到问题, 请使用它。";
"EnglishDxe.efi" = "支持 EFI Shell 使用的 UnicodeCollation 协议, 如果 UEFI 遗漏了它。";

4
CloverApp/Lang.bundle/Contents/Resources/zh-Hant.strings
View File

@ -11,7 +11,7 @@
*/
/* top bar menu */
"N/A" = "N/D"; // not available
"N/A" = "N/D"; // not available (please be short)
"Install Clover" = "Install Clover";
"Current Clover revision" = "Current Clover revision";
"Boot device" = "Boot Device";
@ -125,7 +125,7 @@ Clover may not started with it and you may have wake problem in system. Use with
"DataHubDxe.efi" = "This is DataHub protocol support mandatory for macOS.
Usually it is already present but sometime it may be missed. In this case you should see warning on screen.";
"EmuVariableUefi.UEFI_description" = "Workaround for store NVRAM variables for systems without UEFI hardware.
"EmuVariableUefi.efi" = "Workaround for store NVRAM variables for systems without UEFI hardware.
Mostly UEFI boot uses hardware NVRAM but in some rare cases this driver is needed. Use it only if you have a problem without it";
"EnglishDxe.efi" = "Support for UnicodeCollation protocol used by EFI Shell if it missed in UEFI.";

2
buildme
View File

@ -183,7 +183,7 @@ if [[ "$(uname)" == Darwin ]]; then
checkXCODE
make
if [[ -d "${CLOVERROOT}"/.git ]];then
local aname="Clover.app-$( git -C "${CLOVER}" describe --tags --abbrev=0 ).zip"
local aname="Clover.app-$( git -C "${CLOVERROOT}" describe --tags --abbrev=0 ).zip"
else
local aname=Clover.app.zip
fi