From d77778e62ae13b463e39116f04d7909adf54a683 Mon Sep 17 00:00:00 2001 From: vectorsigma72 Date: Thu, 5 Mar 2020 22:28:24 +0100 Subject: [PATCH] No more Clover version --- CloverPackage/CloverUpdater/CloverUpdaterUtility | 2 +- CloverPackage/makeiso | 2 +- CloverPackage/makepkg | 10 ++++------ .../package/Resources/templates/Conclusion.html | 4 ++-- .../package/Resources/templates/Welcome.html | 2 +- CloverPackage/package/buildpkg.sh | 13 +++++-------- CloverPackage/package/po/clover.pot | 8 ++++---- CloverPackage/package/po/de.po | 8 +++++--- CloverPackage/package/po/en.po | 8 +++++--- CloverPackage/package/po/es.po | 8 +++++--- CloverPackage/package/po/fr.po | 8 +++++--- CloverPackage/package/po/hr.po | 8 +++++--- CloverPackage/package/po/id.po | 8 +++++--- CloverPackage/package/po/it.po | 8 +++++--- CloverPackage/package/po/ja.po | 8 +++++--- CloverPackage/package/po/ko.po | 8 +++++--- CloverPackage/package/po/lv.po | 8 +++++--- CloverPackage/package/po/nl.po | 8 +++++--- CloverPackage/package/po/pl.po | 8 +++++--- CloverPackage/package/po/pt-BR.po | 8 +++++--- CloverPackage/package/po/pt.po | 8 +++++--- CloverPackage/package/po/ro.po | 8 +++++--- CloverPackage/package/po/ru.po | 8 +++++--- CloverPackage/package/po/tr.po | 8 +++++--- CloverPackage/package/po/uk.po | 8 +++++--- CloverPackage/package/po/uk_UA.po | 8 +++++--- CloverPackage/package/po/vi.po | 8 +++++--- CloverPackage/package/po/zh_CN.po | 8 +++++--- CloverPackage/package/po/zh_TW.po | 8 +++++--- CloverPackage/package/translate.sh | 4 +--- rEFIt_UEFI/Platform/smbios.cpp | 2 +- 31 files changed, 130 insertions(+), 93 deletions(-) diff --git a/CloverPackage/CloverUpdater/CloverUpdaterUtility b/CloverPackage/CloverUpdater/CloverUpdaterUtility index b0ec76bca..074b61b28 100755 --- a/CloverPackage/CloverUpdater/CloverUpdaterUtility +++ b/CloverPackage/CloverUpdater/CloverUpdaterUtility @@ -61,7 +61,7 @@ choice=$("$CLOVER_APP_SUPPORT"/CloverUpdater.app/Contents/MacOS/CloverUpdater \ case "$choice" in -1) "$PLISTBUDDY" -c "Add AllowUpdate bool false" "$CLOVER_UPDATER_PLIST" &>/dev/null ;; - 1) open https://github.com/CloverHackyColor/CloverBootloader/releases/download/${last_revision}/Clover_v2.5k_r${last_revision}.pkg + 1) open https://github.com/CloverHackyColor/CloverBootloader/releases/download/${last_revision}/Clover_r${last_revision}.pkg ;; esac diff --git a/CloverPackage/makeiso b/CloverPackage/makeiso index d412b7260..f6bf53652 100755 --- a/CloverPackage/makeiso +++ b/CloverPackage/makeiso @@ -33,7 +33,7 @@ EFIROOT=${SRCROOT}/CloverV2/EFI BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) -PRODUCT=Clover-v2.5k-${REVISION} +PRODUCT=Clover-${REVISION} CDLABEL=${PRODUCT}-X64 ISOIMAGE=${SYMROOT}/${CDLABEL}.iso diff --git a/CloverPackage/makepkg b/CloverPackage/makepkg index 5e6a7c388..e98146f8b 100755 --- a/CloverPackage/makepkg +++ b/CloverPackage/makepkg @@ -31,14 +31,12 @@ done # Go to the script directory to create the package cd "$(dirname $0)" -version=v2.5k revision=$(git describe --tags $(git rev-list --tags --max-count=1)) SRCROOT="${PWD}" SYMROOT="${SRCROOT}"/sym PKG_BUILD_DIR="${SYMROOT}"/package -echo "${version}" > version echo "${revision}" > revision # Workspace = edk2/Clover/CloverPackage @@ -82,14 +80,14 @@ fi package/buildpkg.sh --srcroot "$SRCROOT" --symroot "sym" --builddir "$PKG_BUILD_DIR" ${NOEXTRAS:1} || exit $? -(cd sym ; zip Clover_${version}_r${revision}.zip \ - Clover_${version}_r${revision}.pkg \ - Clover_${version}_r${revision}.pkg.md5 ) +(cd sym ; zip Clover_r${revision}.zip \ + Clover_r${revision}.pkg \ + Clover_r${revision}.pkg.md5 ) # Workspace = edk2/Clover/CloverPackage/ # Remove temp files. -rm -f version +rm -f version # take this to clean old sources rm -f revision # Workspace = edk2/Clover/CloverPackage diff --git a/CloverPackage/package/Resources/templates/Conclusion.html b/CloverPackage/package/Resources/templates/Conclusion.html index b655c64cc..5ca70b652 100644 --- a/CloverPackage/package/Resources/templates/Conclusion.html +++ b/CloverPackage/package/Resources/templates/Conclusion.html @@ -17,11 +17,11 @@

Clover EFI

-

%CLOVERVERSION% r%CLOVERREVISION%

+

r%CLOVERREVISION%


Installation Complete!


Copyright © %CPRYEAR%

- \ No newline at end of file + diff --git a/CloverPackage/package/Resources/templates/Welcome.html b/CloverPackage/package/Resources/templates/Welcome.html index dc38d8f96..915bc31db 100644 --- a/CloverPackage/package/Resources/templates/Welcome.html +++ b/CloverPackage/package/Resources/templates/Welcome.html @@ -28,7 +28,7 @@

Clover EFI

-

%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)

+

r%CLOVERREVISION% (%CLOVERSHA1%)


Developers:

diff --git a/CloverPackage/package/buildpkg.sh b/CloverPackage/package/buildpkg.sh index e2252c17b..085c952f7 100755 --- a/CloverPackage/package/buildpkg.sh +++ b/CloverPackage/package/buildpkg.sh @@ -80,10 +80,8 @@ COL_BLUE="\x1b[34;01m" COL_RESET="\x1b[39;49;00m" # ====== REVISION/VERSION ====== -declare -r CLOVER_VERSION=$( cat version ) # stage -CLOVER_STAGE=${CLOVER_VERSION##*-} -CLOVER_STAGE=${CLOVER_STAGE/RC/Release Candidate } +CLOVER_STAGE=${RC/Release Candidate } CLOVER_STAGE=${CLOVER_STAGE/FINAL/2.2 Final} declare -r CLOVER_STAGE declare -r CLOVER_REVISION=$( cat revision ) @@ -201,7 +199,6 @@ function makeSubstitutions () { fi local cloverSubsts=" -s&%CLOVERVERSION%&${CLOVER_VERSION%%-*}&g s&%CLOVERREVISION%&${CLOVER_REVISION}&g s&%CLOVERSHA1%&${CLOVER_SHA1}&g s&%CLOVERSTAGE%&${CLOVER_STAGE}&g @@ -1575,7 +1572,7 @@ buildpackage () #[ "${3}" == "relocatable" ] && header+="relocatable=\"true\" " header+="identifier=\"${packageRefId}\" " - header+="version=\"${CLOVER_VERSION}\" " + header+="version=\"${CLOVER_REVISION}\" " [ "${targetPath}" != "relocatable" ] && header+="install-location=\"${targetPath}\" " @@ -1610,7 +1607,7 @@ buildpackage () (pkgutil --flatten "${packagePath}/Temp" "${packagePath}/../${packageName}.pkg") # Add the package to the list of build packages - pkgrefs[${#pkgrefs[*]}]="\t#${packageName}.pkg" + pkgrefs[${#pkgrefs[*]}]="\t#${packageName}.pkg" rm -rf "${packagePath}" fi @@ -1708,7 +1705,7 @@ generateChoices() { makedistribution () { declare -r distributionDestDir="${SYMROOT}" - declare -r distributionFilename="${packagename// /}_${CLOVER_VERSION}_r${CLOVER_REVISION}.pkg" + declare -r distributionFilename="${packagename// /}_r${CLOVER_REVISION}.pkg" declare -r distributionFilePath="${distributionDestDir}/${distributionFilename}" rm -f "${distributionDestDir}/${packagename// /}"*.pkg @@ -1777,7 +1774,7 @@ makedistribution () echo -e $COL_GREEN" ===========" echo -e $COL_BLUE" Package name: "$COL_RESET"${distributionFilename}" echo -e $COL_BLUE" MD5: "$COL_RESET"$md5" - echo -e $COL_BLUE" Version: "$COL_RESET"$CLOVER_VERSION" + echo -e $COL_BLUE" Revision: "$COL_RESET"$CLOVER_REVISION" echo -e $COL_BLUE" Stage: "$COL_RESET"$CLOVER_STAGE" echo -e $COL_BLUE" Date/Time: "$COL_RESET"$CLOVER_BUILDDATE" echo -e $COL_BLUE" Built by: "$COL_RESET"$CLOVER_WHOBUILD" diff --git a/CloverPackage/package/po/clover.pot b/CloverPackage/package/po/clover.pot index 80ebef003..7849dfd35 100644 --- a/CloverPackage/package/po/clover.pot +++ b/CloverPackage/package/po/clover.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Clover v2.5k-r5098\n" -"POT-Creation-Date: 2019-11-06 23:33+0100\n" +"Project-Id-Version: Clover r5104\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgstr "" #. type: Content of:

#: Resources/templates/Welcome.html:31 -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "" #. type: Content of:

@@ -201,7 +201,7 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "" #. type: Content of:

diff --git a/CloverPackage/package/po/de.po b/CloverPackage/package/po/de.po index a6bc10e86..84292e43c 100644 --- a/CloverPackage/package/po/de.po +++ b/CloverPackage/package/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-14 17:40+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ge \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -228,7 +228,9 @@ msgstr "Sichern des boot.log im OS und des preboot.log mit F2." #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/en.po b/CloverPackage/package/po/en.po index 5bba8894d..d9821626e 100644 --- a/CloverPackage/package/po/en.po +++ b/CloverPackage/package/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -29,7 +29,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -219,7 +219,9 @@ msgstr "Saving boot.log in OS and preboot.log from GUI by typing F2." #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/es.po b/CloverPackage/package/po/es.po index 0a0f4fbb3..d5b2e3e89 100644 --- a/CloverPackage/package/po/es.po +++ b/CloverPackage/package/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:38+0200\n" "Last-Translator: vector sigma\n" "Language-Team: es \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -224,7 +224,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/fr.po b/CloverPackage/package/po/fr.po index 672a87be5..f341abe3c 100644 --- a/CloverPackage/package/po/fr.po +++ b/CloverPackage/package/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -29,7 +29,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -228,7 +228,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/hr.po b/CloverPackage/package/po/hr.po index 53d20e7b4..a16074ec4 100644 --- a/CloverPackage/package/po/hr.po +++ b/CloverPackage/package/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:39+0200\n" "Last-Translator: vector sigma\n" "Language-Team: hr \n" @@ -28,7 +28,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -221,7 +221,9 @@ msgstr "Moguće spremati boot.log u OS-u te preboot.log kroz GUI pritiskom F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/id.po b/CloverPackage/package/po/id.po index 2663f1c60..f5fd66bbb 100644 --- a/CloverPackage/package/po/id.po +++ b/CloverPackage/package/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-20 10:15+0700\n" "Last-Translator: Badruzeus\n" "Language-Team: id \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -220,7 +220,9 @@ msgstr "Simpan boot.log di OS dan preboot.log dari GUI dengan tombol F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/it.po b/CloverPackage/package/po/it.po index 2a4a70c11..9b3d0a06e 100644 --- a/CloverPackage/package/po/it.po +++ b/CloverPackage/package/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-13 10:25+0200\n" "Last-Translator: vector sigma\n" "Language-Team: it \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -220,7 +220,9 @@ msgstr "Salva il boot.log in OS e preboot.log dalla GUI premendo F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/ja.po b/CloverPackage/package/po/ja.po index 446ee83e7..43868249d 100644 --- a/CloverPackage/package/po/ja.po +++ b/CloverPackage/package/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:41+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -28,7 +28,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -219,7 +219,9 @@ msgstr "OSのboot.logとGUIのpreboot.logの保存はF2キーを押下してく #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/ko.po b/CloverPackage/package/po/ko.po index cc44407c0..8e64a4515 100644 --- a/CloverPackage/package/po/ko.po +++ b/CloverPackage/package/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ko \n" @@ -29,7 +29,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -226,7 +226,9 @@ msgstr "F12키로 boot.log(OS)와 preboot.log(GUI)를 저장합니다." #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/lv.po b/CloverPackage/package/po/lv.po index 67a0d4adc..43afa0639 100644 --- a/CloverPackage/package/po/lv.po +++ b/CloverPackage/package/po/lv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:42+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -28,7 +28,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -230,7 +230,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/nl.po b/CloverPackage/package/po/nl.po index b6429b6e1..7c73b941a 100644 --- a/CloverPackage/package/po/nl.po +++ b/CloverPackage/package/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-14 12:37+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -221,7 +221,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/pl.po b/CloverPackage/package/po/pl.po index 1d143142c..e36fdb5c6 100644 --- a/CloverPackage/package/po/pl.po +++ b/CloverPackage/package/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:43+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pl \n" @@ -28,7 +28,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -225,7 +225,9 @@ msgstr "Zapisywanie boot.log w OS oraz preboot.log w GUI za pomocą klawisza F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/pt-BR.po b/CloverPackage/package/po/pt-BR.po index be77a392a..197e5078e 100644 --- a/CloverPackage/package/po/pt-BR.po +++ b/CloverPackage/package/po/pt-BR.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:44+0200\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -222,7 +222,9 @@ msgstr "Salva boot.log no sistema e preboot.log pelo GUI apertando a tecla F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/pt.po b/CloverPackage/package/po/pt.po index d01cc2cbf..e4a227245 100644 --- a/CloverPackage/package/po/pt.po +++ b/CloverPackage/package/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-19 10:48+0100\n" "Last-Translator: vector sigma\n" "Language-Team: pt \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -220,7 +220,9 @@ msgstr "Salva boot.log no sistema e preboot.log pelo GUI apertando a tecla F2" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/ro.po b/CloverPackage/package/po/ro.po index afdae2562..87881bd3a 100644 --- a/CloverPackage/package/po/ro.po +++ b/CloverPackage/package/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-07-14 21:16+0300\n" "Last-Translator: vector sigma\n" "Language-Team: ro \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -224,7 +224,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/ru.po b/CloverPackage/package/po/ru.po index c30ef7815..e0f2aee44 100644 --- a/CloverPackage/package/po/ru.po +++ b/CloverPackage/package/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: \n" "Last-Translator: vector sigma\n" "Language-Team: ru \n" @@ -30,7 +30,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -233,7 +233,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/tr.po b/CloverPackage/package/po/tr.po index 6435d8fdf..2ea80efb1 100644 --- a/CloverPackage/package/po/tr.po +++ b/CloverPackage/package/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:46+0200\n" "Last-Translator: vector sigma\n" "Language-Team: \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -221,7 +221,9 @@ msgstr "İşletim sistemine boot.log ve F2 ile arabirimden preboot.log kaydetme" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/uk.po b/CloverPackage/package/po/uk.po index b32455162..965e0b8a1 100644 --- a/CloverPackage/package/po/uk.po +++ b/CloverPackage/package/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -28,7 +28,7 @@ msgstr "Кловер EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -229,7 +229,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/uk_UA.po b/CloverPackage/package/po/uk_UA.po index 835f87f96..cfb9ff861 100644 --- a/CloverPackage/package/po/uk_UA.po +++ b/CloverPackage/package/po/uk_UA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: ua \n" @@ -28,7 +28,7 @@ msgstr "Кловер EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -229,7 +229,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/vi.po b/CloverPackage/package/po/vi.po index d569a8d7a..bc8d75b1e 100644 --- a/CloverPackage/package/po/vi.po +++ b/CloverPackage/package/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:47+0200\n" "Last-Translator: vector sigma\n" "Language-Team: en \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -229,7 +229,9 @@ msgstr "" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/zh_CN.po b/CloverPackage/package/po/zh_CN.po index 060af9f8c..90ffec996 100644 --- a/CloverPackage/package/po/zh_CN.po +++ b/CloverPackage/package/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2019-08-09 19:03-0400\n" "Last-Translator: vector sigma\n" "Language-Team: zh_CN \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -209,7 +209,9 @@ msgstr "可按 F2 储存操作系统的日志 boot.log 及 GUI 的日志 preboot #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/po/zh_TW.po b/CloverPackage/package/po/zh_TW.po index b5c9f74d7..0e3d6d831 100644 --- a/CloverPackage/package/po/zh_TW.po +++ b/CloverPackage/package/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Clover 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-21 17:34+0200\n" +"POT-Creation-Date: 2020-03-05 22:25+0100\n" "PO-Revision-Date: 2018-10-02 11:48+0200\n" "Last-Translator: vector sigma\n" "Language-Team: zh_TW \n" @@ -27,7 +27,7 @@ msgstr "Clover EFI" #: Resources/templates/Welcome.html:31 #, fuzzy #| msgid "%CLOVERVERSION% r%CLOVERREVISION%" -msgid "%CLOVERVERSION% r%CLOVERREVISION% (%CLOVERSHA1%)" +msgid "r%CLOVERREVISION% (%CLOVERSHA1%)" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

@@ -210,7 +210,9 @@ msgstr "可按 F2 儲存 OS 的紀錄 boot.log 及 GUI 的紀錄 preboot.log" #. type: Content of:

#: Resources/templates/Conclusion.html:20 -msgid "%CLOVERVERSION% r%CLOVERREVISION%" +#, fuzzy +#| msgid "%CLOVERVERSION% r%CLOVERREVISION%" +msgid "r%CLOVERREVISION%" msgstr "%CLOVERVERSION% r%CLOVERREVISION%" #. type: Content of:

diff --git a/CloverPackage/package/translate.sh b/CloverPackage/package/translate.sh index 4ea235fa7..9fced977a 100755 --- a/CloverPackage/package/translate.sh +++ b/CloverPackage/package/translate.sh @@ -19,8 +19,6 @@ export LC_COLLATE='C' export LC_CTYPE='C' # ====== REVISION/VERSION ====== -declare -r CLOVER_VERSION='v2.5k' -# declare -r CLOVER_REVISION=$(git describe --tags $(git rev-list --tags --max-count=1)) declare -r CLOVER_REVISION=$(git describe --tags --abbrev=0) # ==== CHECK ENVIRONEMENT ==== @@ -97,7 +95,7 @@ fi PERLLIB=bin/po4a/lib \ bin/po4a/po4a \ --package-name 'Clover' \ - --package-version "${CLOVER_VERSION}-r${CLOVER_REVISION}" \ + --package-version "r${CLOVER_REVISION}" \ --msgmerge-opt '--lang=$lang --previous --width=79' \ --variable PODIR="$PODIR" \ --variable TEMPLATES_DIR="$TEMPLATES_DIR" \ diff --git a/rEFIt_UEFI/Platform/smbios.cpp b/rEFIt_UEFI/Platform/smbios.cpp index 5e81e90d7..b98028f22 100644 --- a/rEFIt_UEFI/Platform/smbios.cpp +++ b/rEFIt_UEFI/Platform/smbios.cpp @@ -1089,7 +1089,7 @@ VOID PatchTableType11() // AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.EfiVersion, iStrLen(gSettings.EfiVersion, 64)); AsciiStrCatS(OEMString, MAX_OEM_STRING, "\n Board-ID : "); AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.BoardNumber, iStrLen(gSettings.BoardNumber, 64)); - AsciiSPrint(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover v2.5k %s\n", gFirmwareRevision); + AsciiSPrint(TempRev, MAX_OEM_STRING, "\n⌘ Powered by Clover %s\n", gFirmwareRevision); AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev); UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString);