From affdeb827e597d52366d6e56bf554af74f10600d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 19 May 2026 12:04:32 +0200 Subject: [PATCH] Change rewindstate metadata to say X seconds ago --- Core/SaveStateRewind.cpp | 5 +++++ Tools/langtool/Cargo.lock | 4 ++-- assets/lang/ar_AE.ini | 1 + assets/lang/az_AZ.ini | 1 + assets/lang/be_BY.ini | 1 + assets/lang/bg_BG.ini | 1 + assets/lang/ca_ES.ini | 1 + assets/lang/cz_CZ.ini | 1 + assets/lang/da_DK.ini | 1 + assets/lang/de_DE.ini | 1 + assets/lang/dr_ID.ini | 1 + assets/lang/en_US.ini | 1 + assets/lang/es_ES.ini | 1 + assets/lang/es_LA.ini | 1 + assets/lang/fa_IR.ini | 1 + assets/lang/fi_FI.ini | 1 + assets/lang/fr_FR.ini | 1 + assets/lang/gl_ES.ini | 1 + assets/lang/gr_EL.ini | 1 + assets/lang/he_IL.ini | 1 + assets/lang/he_IL_invert.ini | 1 + assets/lang/hr_HR.ini | 1 + assets/lang/hu_HU.ini | 1 + assets/lang/id_ID.ini | 1 + assets/lang/it_IT.ini | 1 + assets/lang/ja_JP.ini | 1 + assets/lang/jv_ID.ini | 1 + assets/lang/ko_KR.ini | 1 + assets/lang/ku_SO.ini | 1 + assets/lang/lo_LA.ini | 1 + assets/lang/lt-LT.ini | 1 + assets/lang/ms_MY.ini | 1 + assets/lang/nl_NL.ini | 1 + assets/lang/no_NO.ini | 1 + assets/lang/pl_PL.ini | 1 + assets/lang/pt_BR.ini | 1 + assets/lang/pt_PT.ini | 1 + assets/lang/ro_RO.ini | 1 + assets/lang/ru_RU.ini | 1 + assets/lang/sv_SE.ini | 1 + assets/lang/tg_PH.ini | 1 + assets/lang/th_TH.ini | 1 + assets/lang/tr_TR.ini | 1 + assets/lang/uk_UA.ini | 1 + assets/lang/vi_VN.ini | 1 + assets/lang/zh_CN.ini | 1 + assets/lang/zh_TW.ini | 1 + 47 files changed, 52 insertions(+), 2 deletions(-) diff --git a/Core/SaveStateRewind.cpp b/Core/SaveStateRewind.cpp index 8eabc7585b..aa4cc62926 100644 --- a/Core/SaveStateRewind.cpp +++ b/Core/SaveStateRewind.cpp @@ -1,5 +1,6 @@ #include "Common/Thread/ThreadUtil.h" #include "Common/Data/Text/I18n.h" +#include "Common/StringUtils.h" #include "Core/SaveState.h" #include "Core/SaveStateRewind.h" #include "Core/Core.h" @@ -64,11 +65,15 @@ CChunkFileReader::Error StateRingbuffer::Restore(std::string *errorString, std:: *metadata = pa->T("Rewind"); if (states_[n].savedTime) { + auto di = GetI18NCategory(I18NCat::DIALOG); metadata->append(" ("); + metadata->append(ApplySafeSubstitutions(di->T("%1 seconds ago"), static_cast(time_now_d() - states_[n].savedTime))); + /* char buffer[26]; double unixTime = time_to_unix_utc(states_[n].savedTime); FormatUnixTime(unixTime, buffer, sizeof(buffer), false); metadata->append(buffer); + */ metadata->append(")"); } diff --git a/Tools/langtool/Cargo.lock b/Tools/langtool/Cargo.lock index bbdfbfe047..91d519458e 100644 --- a/Tools/langtool/Cargo.lock +++ b/Tools/langtool/Cargo.lock @@ -1727,9 +1727,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ "bitflags 2.11.1", "bytes", diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 2b8f3bc24b..bb192ba908 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -400,6 +400,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = منذ %1 ثانية # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index 32d733ca71..837b93b953 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 saniyə əvvəl # AI translated %d hours = %d saat %d minutes = %d dəqiqə %d ms = %d ms diff --git a/assets/lang/be_BY.ini b/assets/lang/be_BY.ini index b050790e7b..93b76d5537 100644 --- a/assets/lang/be_BY.ini +++ b/assets/lang/be_BY.ini @@ -392,6 +392,7 @@ Vertex = Вяршыня VFPU = VFPU [Dialog] +%1 seconds ago = прыкладна %1 секунд таму # AI translated %d hours = %d г %d minutes = %d хв %d ms = %d мс diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 1cbbe17765..b194e9d71c 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = преди %1 секунди # AI translated %d hours = %d часове %d minutes = %d минути %d ms = %d мс diff --git a/assets/lang/ca_ES.ini b/assets/lang/ca_ES.ini index 1daf258d4b..4d35ece24d 100644 --- a/assets/lang/ca_ES.ini +++ b/assets/lang/ca_ES.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = fa %1 segons # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index 2d137701cd..ada3887812 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = před %1 sekundami # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index 1297c309b5..d70675d1f4 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = for %1 sekunder siden # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/de_DE.ini b/assets/lang/de_DE.ini index 9d3c519753..a01db48fae 100644 --- a/assets/lang/de_DE.ini +++ b/assets/lang/de_DE.ini @@ -391,6 +391,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = vor %1 Sekunden # AI translated %d hours = %d Stunden %d minutes = %d Minuten %d ms = %d ms diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index c0290b7928..870df3a4b6 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 detik yang lalu # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index f60c941f47..a2c2c53ee6 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -416,6 +416,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 seconds ago %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/es_ES.ini b/assets/lang/es_ES.ini index e983e385c3..f5e7b6ee1f 100644 --- a/assets/lang/es_ES.ini +++ b/assets/lang/es_ES.ini @@ -393,6 +393,7 @@ Vertex = Vértices VFPU = VFPU [Dialog] +%1 seconds ago = hace %1 segundos # AI translated %d hours = %d horas %d minutes = %d minutos %d ms = %d ms diff --git a/assets/lang/es_LA.ini b/assets/lang/es_LA.ini index dbf3cb3152..fdf0c6c5d0 100644 --- a/assets/lang/es_LA.ini +++ b/assets/lang/es_LA.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = hace %1 segundos # AI translated %d hours = %d horas %d minutes = %d minutos %d ms = %d ms diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 5c8373f8e7..4bde39d346 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = قبل از %1 ثانیه # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d میلی‌ثانیه diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index 0241885b07..eabc310cd2 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 sekuntia sitten # AI translated %d hours = %d tuntia %d minutes = %d minuuttia %d ms = %d ms diff --git a/assets/lang/fr_FR.ini b/assets/lang/fr_FR.ini index 8efc6ec288..1c61b7280b 100644 --- a/assets/lang/fr_FR.ini +++ b/assets/lang/fr_FR.ini @@ -416,6 +416,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = il y a %1 secondes # AI translated %d hours = %d heures %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index 2b3f1e598a..c61bac47af 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = hai %1 segundos # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/gr_EL.ini b/assets/lang/gr_EL.ini index d3ddeba23f..80743c9060 100644 --- a/assets/lang/gr_EL.ini +++ b/assets/lang/gr_EL.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = πριν από %1 δευτερόλεπτα # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index 3ade3a70b2..d1598c7278 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = לפני %1 שניות # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 16a70df8f2..5e08433a60 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = לפני %1 שניות # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/hr_HR.ini b/assets/lang/hr_HR.ini index ff5f455142..8ab11f19f4 100644 --- a/assets/lang/hr_HR.ini +++ b/assets/lang/hr_HR.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = prije %1 sekundi # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/hu_HU.ini b/assets/lang/hu_HU.ini index 6384a42a1e..91574ba675 100644 --- a/assets/lang/hu_HU.ini +++ b/assets/lang/hu_HU.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 másodperce # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/id_ID.ini b/assets/lang/id_ID.ini index 50aea553e7..4554527ba3 100644 --- a/assets/lang/id_ID.ini +++ b/assets/lang/id_ID.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = sejak %1 detik yang lalu # AI translated %d hours = %d jam %d minutes = %d menit %d ms = %d ms diff --git a/assets/lang/it_IT.ini b/assets/lang/it_IT.ini index 93acd4f292..3e42a0bcb7 100644 --- a/assets/lang/it_IT.ini +++ b/assets/lang/it_IT.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = fa %1 secondi # AI translated %d hours = %d ore %d minutes = %d minuti %d ms = %d ms diff --git a/assets/lang/ja_JP.ini b/assets/lang/ja_JP.ini index 668ede3198..d9805bdae8 100644 --- a/assets/lang/ja_JP.ini +++ b/assets/lang/ja_JP.ini @@ -392,6 +392,7 @@ Vertex = 頂点 VFPU = VFPU [Dialog] +%1 seconds ago = %1 秒前 # AI translated %d hours = %d 時間 %d minutes = %d 分 %d ms = %d ms diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index f9bce51608..bae709408c 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = saka %1 detik kepungkur # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/ko_KR.ini b/assets/lang/ko_KR.ini index ca855d8a9f..700f0a7706 100644 --- a/assets/lang/ko_KR.ini +++ b/assets/lang/ko_KR.ini @@ -392,6 +392,7 @@ Vertex = 꼭짓점 VFPU = VFPU [Dialog] +%1 seconds ago = %1초 전 # AI translated %d hours = %d 시간 %d minutes = %d 분 %d ms = %d ms diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini index 13fdb8d9b0..5f8ea73409 100644 --- a/assets/lang/ku_SO.ini +++ b/assets/lang/ku_SO.ini @@ -406,6 +406,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = bori %1 çirkan # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index 7977e1426e..65ceaefbb5 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = ຕ໭ວບ %1 ວິນາທີ # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 80c955f756..eb55dcca26 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = prieš %1 sekundes # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index 3e679dc319..b404f11ec6 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = lebih %1 saat yang lalu # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index aa0f2a678d..23567e00be 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = ongeveer %1 seconden geleden # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 7406157769..ab21b7a95b 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = for %1 sekunder siden # AI translated %d hours = %d timer %d minutes = %d minutter %d ms = %d ms diff --git a/assets/lang/pl_PL.ini b/assets/lang/pl_PL.ini index bde823aae0..06962d68ea 100644 --- a/assets/lang/pl_PL.ini +++ b/assets/lang/pl_PL.ini @@ -392,6 +392,7 @@ Vertex = Wierzchołka VFPU = VFPU [Dialog] +%1 seconds ago = przed %1 sekundami # AI translated %d hours = %d godzin %d minutes = %d minut %d ms = %d milisekund diff --git a/assets/lang/pt_BR.ini b/assets/lang/pt_BR.ini index ac7bf38811..a4eb698d7f 100644 --- a/assets/lang/pt_BR.ini +++ b/assets/lang/pt_BR.ini @@ -416,6 +416,7 @@ Vertex = Vértice VFPU = VFPU [Dialog] +%1 seconds ago = há %1 segundos # AI translated %d hours = %d horas %d minutes = %d minutos %d ms = %d ms diff --git a/assets/lang/pt_PT.ini b/assets/lang/pt_PT.ini index 27aa60d51a..bde2c0a51b 100644 --- a/assets/lang/pt_PT.ini +++ b/assets/lang/pt_PT.ini @@ -416,6 +416,7 @@ Vertex = Vértice VFPU = VFPU [Dialog] +%1 seconds ago = há %1 segundos # AI translated %d hours = %d horas %d minutes = %d minutos %d ms = %d ms diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 7765f0686b..dc6d4f1cd8 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -393,6 +393,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = acum %1 secunde # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/ru_RU.ini b/assets/lang/ru_RU.ini index 54a78243be..7178870c16 100644 --- a/assets/lang/ru_RU.ini +++ b/assets/lang/ru_RU.ini @@ -392,6 +392,7 @@ Vertex = Вершина VFPU = VFPU [Dialog] +%1 seconds ago = %1 секунду назад # AI translated %d hours = %d ч %d minutes = %d мин %d ms = %d мс diff --git a/assets/lang/sv_SE.ini b/assets/lang/sv_SE.ini index e1d6f67122..4460c4c2fe 100644 --- a/assets/lang/sv_SE.ini +++ b/assets/lang/sv_SE.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = för %1 sekunder sedan # AI translated %d hours = %d timmar %d minutes = %d minuter %d ms = %d ms diff --git a/assets/lang/tg_PH.ini b/assets/lang/tg_PH.ini index ebc8fc4ad6..a82c7b5819 100644 --- a/assets/lang/tg_PH.ini +++ b/assets/lang/tg_PH.ini @@ -393,6 +393,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = ҳоло %1 сония пеш # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini index c421c06019..0b806ec06c 100644 --- a/assets/lang/th_TH.ini +++ b/assets/lang/th_TH.ini @@ -408,6 +408,7 @@ Vulkan = วัลแคน VFPU = VFPU [Dialog] +%1 seconds ago = เมื่อ %1 วินาทีที่แล้ว # AI translated %d hours = %d ชั่วโมง %d minutes = %d นาที %d ms = %d ms diff --git a/assets/lang/tr_TR.ini b/assets/lang/tr_TR.ini index 66a379b7ee..ef8f3960aa 100644 --- a/assets/lang/tr_TR.ini +++ b/assets/lang/tr_TR.ini @@ -394,6 +394,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = %1 saniye önce # AI translated %d hours = %d saat %d minutes = %d dakika %d ms = %d ms diff --git a/assets/lang/uk_UA.ini b/assets/lang/uk_UA.ini index eda0d05ed8..d3b876b103 100644 --- a/assets/lang/uk_UA.ini +++ b/assets/lang/uk_UA.ini @@ -392,6 +392,7 @@ Vertex = Вершина VFPU = VFPU [Dialog] +%1 seconds ago = %1 секунд тому # AI translated %d hours = %d год %d minutes = %d хв %d ms = %d мс diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index 11873c79bd..60587210ac 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -392,6 +392,7 @@ Vertex = Vertex VFPU = VFPU [Dialog] +%1 seconds ago = trước %1 giây # AI translated %d hours = %d hours %d minutes = %d minutes %d ms = %d ms diff --git a/assets/lang/zh_CN.ini b/assets/lang/zh_CN.ini index efed768b1f..94f68bb6c9 100644 --- a/assets/lang/zh_CN.ini +++ b/assets/lang/zh_CN.ini @@ -392,6 +392,7 @@ Vertex = 顶点着色器 VFPU = VFPU [Dialog] +%1 seconds ago = %1秒前 # AI translated %d hours = %d 小时 %d minutes = %d 分 %d ms = %d 毫秒 diff --git a/assets/lang/zh_TW.ini b/assets/lang/zh_TW.ini index 46c4c1d391..93ddf851e6 100644 --- a/assets/lang/zh_TW.ini +++ b/assets/lang/zh_TW.ini @@ -392,6 +392,7 @@ Vertex = 頂點 VFPU = VFPU [Dialog] +%1 seconds ago = %1 秒鐘前 # AI translated %d hours = %d 小時 %d minutes = %d 分 %d ms = %d 毫秒