diff --git a/arm9/source/common/ui.c b/arm9/source/common/ui.c index e2de1ebad..c8207aee1 100644 --- a/arm9/source/common/ui.c +++ b/arm9/source/common/ui.c @@ -1431,7 +1431,11 @@ bool ShowProgress(u64 current, u64 total, const char* opstr) ResizeString(progstr, tempstr, bar_width / FONT_WIDTH_EXT, 8, false); DrawString(MAIN_SCREEN, progstr, bar_pos_x, text_pos_y, COLOR_STD_FONT, COLOR_STD_BG); if (sec_elapsed >= 1) { - snprintf(tempstr, sizeof(tempstr), STR_ETA_N_MIN_N_SEC, sec_remain / 60, sec_remain % 60); + if (sec_remain >= 3600) { + snprintf(tempstr, sizeof(tempstr), STR_ETA_N_HOUR_N_MIN_N_SEC, (sec_remain / 3600), (sec_remain / 60) % 60, sec_remain % 60); + } else { + snprintf(tempstr, sizeof(tempstr), STR_ETA_N_MIN_N_SEC, sec_remain / 60, sec_remain % 60); + } ResizeString(progstr, tempstr, 16, 8, true); DrawString(MAIN_SCREEN, progstr, bar_pos_x + bar_width - 1 - (FONT_WIDTH_EXT * 16), bar_pos_y - line_height - 1, COLOR_STD_FONT, COLOR_STD_BG); diff --git a/arm9/source/language.inl b/arm9/source/language.inl index 547f10b2c..46945ec09 100644 --- a/arm9/source/language.inl +++ b/arm9/source/language.inl @@ -488,6 +488,7 @@ STRING(N_MORE, " [%d more]") STRING(CANCEL, "cancel") STRING(R_FAST_SCROLL_L_CLEAR_DATA, "R - (↑↓) fast scroll\nL - clear data") STRING(X_REMOVE_CHAR_Y_INSERT_CHAR, "X - remove char\nY - insert char") +STRING(ETA_N_HOUR_N_MIN_N_SEC, "ETA %02lluh%02llum%02lluh") STRING(ETA_N_MIN_N_SEC, "ETA %02llum%02llus") STRING(BRIGHTNESS_CONTROLS, "[←] Decrease brightness\n[→] Increase brightness\n \n[X] Use volume slider control\n[A] Set current brightness\n[B] Cancel") STRING(SEARCHING_PLEASE_WAIT, "Searching, please wait...") diff --git a/resources/languages/de.json b/resources/languages/de.json index 1f55d4fd8..1e0f1a2d2 100644 --- a/resources/languages/de.json +++ b/resources/languages/de.json @@ -486,6 +486,7 @@ "CANCEL": "abbrechen", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) schnelles scrollen\nL - Eingabe leeren", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - Zeichen entfernen\nY - Zeichen einfügen", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "ETA %02llum%02llus", "BRIGHTNESS_CONTROLS": "[←] Helligkeit verringern\n[→] Helligkeit erhöhen\n \n[X] Nutze Lautstärkeregler\n[A] Aktuelle Helligkeit einstellen\n[B] Abbrechen", "SEARCHING_PLEASE_WAIT": "Suche, bitte warten...", diff --git a/resources/languages/es.json b/resources/languages/es.json index 1e1a63b29..187604950 100644 --- a/resources/languages/es.json +++ b/resources/languages/es.json @@ -485,6 +485,7 @@ "CANCEL": "cancel", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) fast scroll\nL - clear data", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - remove char\nY - insert char", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "ETA %02llum%02llus", "BRIGHTNESS_CONTROLS": "[←] Decrease brightness\n[→] Increase brightness\n \n[X] Use volume slider control\n[A] Set current brightness\n[B] Cancel", "SEARCHING_PLEASE_WAIT": "Searching, please wait...", diff --git a/resources/languages/fr.json b/resources/languages/fr.json index 86fd5c540..a8575cf61 100644 --- a/resources/languages/fr.json +++ b/resources/languages/fr.json @@ -486,6 +486,7 @@ "CANCEL": "annuler", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) défilement rapide\nL - effacer les données", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - supprimer le caractère\nY - insérer le caractère", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "ETA %02llum%02llus", "BRIGHTNESS_CONTROLS": "[←] Decrease brightness\n[→] Increase brightness\n \n[X] Use volume slider control\n[A] Set current brightness\n[B] Cancel", "SEARCHING_PLEASE_WAIT": "Recherche en cours, veuillez patienter…", diff --git a/resources/languages/id.json b/resources/languages/id.json index 92519603c..665633d17 100644 --- a/resources/languages/id.json +++ b/resources/languages/id.json @@ -486,6 +486,7 @@ "CANCEL": "batal", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) gulir cepat\nL - kosongkan data", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - hapus karakter\nY - sisip karakter", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "Sisa %02lluh%02llumnt%02lludtk", "ETA_N_MIN_N_SEC": "Sisa %02llumnt%02lludtk", "BRIGHTNESS_CONTROLS": "[←] Kurangi kecerahan\n[→] Tingkatkan kecerahan\n \n[X] Pakai penggeser volume\n[A] Atur kecerahan saat ini\n[B] Batal", "SEARCHING_PLEASE_WAIT": "Mencari, mohon tunggu...", diff --git a/resources/languages/ja.json b/resources/languages/ja.json index b4c7de0d9..925798d93 100644 --- a/resources/languages/ja.json +++ b/resources/languages/ja.json @@ -486,6 +486,7 @@ "CANCEL": "キャンセル", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) 高速スクロール\nL - データをクリア", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - 文字を削除\nY - 文字を挿入", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "残り%02llu分%02llu秒", "BRIGHTNESS_CONTROLS": "[→] 明るさを上げる\n[←] 明るさを下げる\n \n[X] 音量スライダーでコントロール\n[A] 現在の明るさを設定\n[B] キャンセル", "SEARCHING_PLEASE_WAIT": "検索中です。お待ちください。", diff --git a/resources/languages/nl.json b/resources/languages/nl.json index 8e646795d..e414901e2 100644 --- a/resources/languages/nl.json +++ b/resources/languages/nl.json @@ -486,6 +486,7 @@ "CANCEL": "cancel", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) fast scroll\nL - clear data", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - remove char\nY - insert char", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "ETA %02llum%02llus", "BRIGHTNESS_CONTROLS": "[←] Decrease brightness\n[→] Increase brightness\n \n[X] Use volume slider control\n[A] Set current brightness\n[B] Cancel", "SEARCHING_PLEASE_WAIT": "Searching, please wait...", diff --git a/resources/languages/source.json b/resources/languages/source.json index 79be425ff..3e962baef 100644 --- a/resources/languages/source.json +++ b/resources/languages/source.json @@ -486,6 +486,7 @@ "CANCEL": "cancel", "R_FAST_SCROLL_L_CLEAR_DATA": "R - (↑↓) fast scroll\nL - clear data", "X_REMOVE_CHAR_Y_INSERT_CHAR": "X - remove char\nY - insert char", + "STR_ETA_N_HOUR_N_MIN_N_SEC": "ETA %02lluh%02llum%02llus", "ETA_N_MIN_N_SEC": "ETA %02llum%02llus", "BRIGHTNESS_CONTROLS": "[←] Decrease brightness\n[→] Increase brightness\n \n[X] Use volume slider control\n[A] Set current brightness\n[B] Cancel", "SEARCHING_PLEASE_WAIT": "Searching, please wait...",