Add translation string, show uncompressed size if different from disk…

… size

Common/Data/Text/Parsers.cpp

@@ -19,7 +19,7 @@ void NiceSizeFormat(uint64_t size, char *out, size_t bufSize) {
 	if (s == 0)
 		snprintf(out, bufSize, "%d B", (int)size);
 	else
-		snprintf(out, bufSize, "%3.1f %s", f, sizes[s]);
+		snprintf(out, bufSize, "%3.2f %s", f, sizes[s]);
 }
 
 std::string NiceSizeFormat(uint64_t size) {

Core/Config.cpp

@@ -1918,6 +1918,6 @@ bool PlayTimeTracker::GetPlayedTimeString(const std::string &gameId, std::string
 	totalSeconds /= 60;
 	int hours = totalSeconds;
 
-	*str = StringFromFormat(ga->T("Play time: %02d:%02d:%02d"), hours, minutes, seconds);
+	*str = ApplySafeSubstitutions(ga->T("Time Played: %1h %2m %3s"), hours, minutes, seconds);
 	return true;
 }

Core/RetroAchievements.cpp

@@ -148,6 +148,7 @@ bool IsBlockingExecution() {
 	return g_isLoggingIn || g_isIdentifying;
 }
 
+// This is the RetroAchievements game ID, rather than the PSP game ID.
 static u32 GetGameID() {
 	if (!g_rcClient) {
 		return 0;
@@ -243,6 +244,7 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
 
 		// TODO: Translation?
 		std::string title = ApplySafeSubstitutions(ac->T("Mastered %1"), gameInfo->title);
+
 		rc_client_user_game_summary_t summary;
 		rc_client_get_user_game_summary(g_rcClient, &summary);
 

UI/GameScreen.cpp

@@ -25,6 +25,7 @@
 #include "Common/UI/ViewGroup.h"
 
 #include "Common/Data/Text/I18n.h"
+#include "Common/Data/Text/Parsers.h"
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/File/FileUtil.h"
 #include "Common/StringUtils.h"
@@ -111,7 +112,8 @@ void GameScreen::CreateViews() {
 		LinearLayout *mainGameInfo = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f));
 		mainGameInfo->SetSpacing(3.0f);
 
-		badgeHolder->Add(new GameIconView(gamePath_, 2.0f));
+		// Need an explicit size here because homebrew uses screenshots as icons.
+		badgeHolder->Add(new GameIconView(gamePath_, 2.0f, new LinearLayoutParams(144 * 2, 80 * 2, UI::Margins(0))));
 		badgeHolder->Add(mainGameInfo);
 
 		leftColumn->Add(badgeHolder);
@@ -288,11 +290,15 @@ void GameScreen::render() {
 	if (info->gameSizeOnDisk) {
 		char temp[256];
 		if (tvGameSize_) {
-			snprintf(temp, sizeof(temp), "%s: %1.1f %s", ga->T("Game"), (float)(info->gameSizeOnDisk) / 1024.f / 1024.f, ga->T("MB"));
+			snprintf(temp, sizeof(temp), "%s: %s", ga->T("Game"), NiceSizeFormat(info->gameSizeOnDisk).c_str());
+			if (info->gameSizeUncompressed != info->gameSizeOnDisk) {
+				size_t len = strlen(temp);
+				snprintf(temp + len, sizeof(temp) - len, " (%s: %s)", ga->T("Uncompressed"), NiceSizeFormat(info->gameSizeUncompressed).c_str());
+			}
 			tvGameSize_->SetText(temp);
 		}
 		if (tvSaveDataSize_) {
-			snprintf(temp, sizeof(temp), "%s: %1.2f %s", ga->T("SaveData"), (float)(info->saveDataSize) / 1024.f / 1024.f, ga->T("MB"));
+			snprintf(temp, sizeof(temp), "%s: %s", ga->T("SaveData"), NiceSizeFormat(info->saveDataSize).c_str());
 			tvSaveDataSize_->SetText(temp);
 		}
 		if (info->installDataSize > 0 && tvInstallDataSize_) {

assets/lang/ar_AE.ini

@@ -535,6 +535,8 @@ Remove From Recent = ‎مسح من "الحالي"
 SaveData = ‎بيانات الحفظ
 Setting Background = ‎إعدادات الخلفية
 Show In Folder = ‎أظهر في المجلد
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = ‎أمريكا
 Use UI background = ‎إستخدم خلفية الواجهة
 

assets/lang/az_AZ.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/bg_BG.ini

@@ -527,6 +527,8 @@ Remove From Recent = Премахни от „Скорошни“
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Покажи в папка
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/ca_ES.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Dades guardades
 Setting Background = Imatge de fons
 Show In Folder = Mostrar en carpeta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = EEUU
 Use UI background = Utilitzar imatge de fons de l'interfície d'usuari
 

assets/lang/cz_CZ.ini

@@ -527,6 +527,8 @@ Remove From Recent = Odstranit z "Nedávné"
 SaveData = Uložená data
 Setting Background = Setting background
 Show In Folder = Zobrazit ve složce
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/da_DK.ini

@@ -527,6 +527,8 @@ Remove From Recent = Fjern fra "Nylige"
 SaveData = Gem data
 Setting Background = Setting background
 Show In Folder = Vis i katalog
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Brug UI baggrund
 

assets/lang/de_DE.ini

@@ -527,6 +527,8 @@ Remove From Recent = Aus der Liste entfernen
 SaveData = Speicherdaten
 Setting Background = Einstellungshintergrund
 Show In Folder = Ordner öffnen
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Benutze UI Hintergrund
 

assets/lang/dr_ID.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Pangsave
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/en_US.ini

@@ -551,6 +551,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/es_ES.ini

@@ -527,6 +527,8 @@ Remove From Recent = Borrar de recientes
 SaveData = Datos
 Setting Background = Ajustar imagen de fondo
 Show In Folder = Mostrar en carpeta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = América
 Use UI background = Usar imagen de fondo
 

assets/lang/es_LA.ini

@@ -527,6 +527,8 @@ Remove From Recent = Borrar de recientes
 SaveData = Datos
 Setting Background = Configurar fondo
 Show In Folder = Mostrar en carpeta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = América
 Use UI background = Usar fondo como interfaz
 

assets/lang/fa_IR.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = ‎دیتای ذخیره
 Setting Background = تنظیمات پس زمینا
 Show In Folder = نمایش پوشه
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = آمریکا
 Use UI background = استفاده به عنوان پس زمینه؟
 

assets/lang/fi_FI.ini

@@ -527,6 +527,8 @@ Remove From Recent = Poista "äskettäin" listalta...
 SaveData = Tallennustieto
 Setting Background = Setting background
 Show In Folder = Näytä kansiossa
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/fr_FR.ini

@@ -527,6 +527,8 @@ Remove From Recent = Supprimer de "Récemment"
 SaveData = Sauvegarde 
 Setting Background = Paramétrage du fond d'écran
 Show In Folder = Montrer dans dossier
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Utiliser le fond d'écran
 

assets/lang/gl_ES.ini

@@ -527,6 +527,8 @@ Remove From Recent = Borrar de recentes
 SaveData = Datos
 Setting Background = Setting background
 Show In Folder = Mostrar en carpeta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/gr_EL.ini

@@ -527,6 +527,8 @@ Remove From Recent = Κατάργηση από τα πρόσφατα
 SaveData = Δεδομένα Αποθήκευσης
 Setting Background = Ρύθμιση φόντου
 Show In Folder = Εμφάνιση σε Φάκελο
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = ΗΠΑ
 Use UI background = Χρήση φόντου UI
 

assets/lang/he_IL.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/he_IL_invert.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/hr_HR.ini

@@ -527,6 +527,8 @@ Remove From Recent = Makni iz "Nedavno"
 SaveData = Savedata
 Setting Background = Postavljanje pozadine
 Show In Folder = Prikaži u mapi
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = SAD
 Use UI background = Koristi UI pozadinu
 

assets/lang/hu_HU.ini

@@ -527,6 +527,8 @@ Remove From Recent = Törlés a listából
 SaveData = Mentések
 Setting Background = Háttér beállítás
 Show In Folder = Mutatás mappában
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Alapértelmezett háttér használata
 

assets/lang/id_ID.ini

@@ -527,6 +527,8 @@ Remove From Recent = Hapus dari "Terbaru"
 SaveData = Simpanan data
 Setting Background = Atur latar belakang
 Show In Folder = Tampilkan di berkas
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = Amerika Serikat
 Use UI background = Gunakan latar belakang UI
 

assets/lang/it_IT.ini

@@ -527,6 +527,8 @@ Remove From Recent = Rimuovi dai Recenti
 SaveData = Dati salvataggio
 Setting Background = Imposta sfondo
 Show In Folder = Mostra nella Cartella
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Usa sfondo interfaccia
 

assets/lang/ja_JP.ini

@@ -527,6 +527,8 @@ Remove From Recent = 履歴から削除する
 SaveData = セーブデータ
 Setting Background = 背景を設定
 Show In Folder = フォルダに表示する
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = UIの背景を使う
 

assets/lang/jv_ID.ini

@@ -527,6 +527,8 @@ Remove From Recent = Mbusek soko "Terakher"
 SaveData = Simpen Data
 Setting Background = Setting background
 Show In Folder = Tampilno Nang Folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/ko_KR.ini

@@ -527,6 +527,8 @@ Remove From Recent = "최근"에서 제거
 SaveData = 저장데이터
 Setting Background = 배경 설정
 Show In Folder = 폴더에 표기
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = 미국
 Use UI background = UI 배경 사용
 

assets/lang/lo_LA.ini

@@ -527,6 +527,8 @@ Remove From Recent = ເອົາອອກຈາກໜ້າ "ຫຼ້າສຸ
 SaveData = ບັນທຶກຂໍ້ມູນ
 Setting Background = Setting background
 Show In Folder = ສະແດງໃນໂຟນເດີ້
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = ໃຊ້ເປັນພາບພື້ນຫຼັງ
 

assets/lang/lt-LT.ini

@@ -527,6 +527,8 @@ Remove From Recent = Ištrinti iš "Paskutiniai" sąrašo
 SaveData = Išsaugojimai
 Setting Background = Setting background
 Show In Folder = Rodyti aplanke
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/ms_MY.ini

@@ -527,6 +527,8 @@ Remove From Recent = Hapuskan dari "Semasa"
 SaveData = Data disimpan
 Setting Background = Setting background
 Show In Folder = Papar dalam folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/nl_NL.ini

@@ -527,6 +527,8 @@ Remove From Recent = Wissen uit "Recent"
 SaveData = Opgeslagen data
 Setting Background = Achtergrondinstelling
 Show In Folder = Weergeven in map
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = VS
 Use UI background = UI-achtergrond gebruiken
 

assets/lang/no_NO.ini

@@ -527,6 +527,8 @@ Remove From Recent = Remove from "Recent"
 SaveData = Savedata
 Setting Background = Setting background
 Show In Folder = Show in folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/pl_PL.ini

@@ -532,6 +532,8 @@ Remove From Recent = Usuń z "Ostatnio uruchamianych tytułów"
 SaveData = Zapisy gier
 Setting Background = Ustawianie tła
 Show In Folder = Pokaż w folderze
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Użyj tego tła
 

assets/lang/pt_BR.ini

@@ -551,6 +551,8 @@ Remove From Recent = Remover dos "Recentes"
 SaveData = Dados do save
 Setting Background = Configurando o cenário de fundo
 Show In Folder = Mostrar na pasta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = EUA
 Use UI background = Usar cenário de fundo da interface do usuário
 

assets/lang/pt_PT.ini

@@ -551,6 +551,8 @@ Remove From Recent = Remover de "Recente"
 SaveData = Dados Salvos
 Setting Background = Definindo o cenário de fundo
 Show In Folder = Mostrar na pasta
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = EUA
 Use UI background = Usar cenário de fundo da interface do usuário.
 

assets/lang/ro_RO.ini

@@ -528,6 +528,8 @@ Remove From Recent = Ștergere de la "Recent"
 SaveData = Salvare
 Setting Background = Setting background
 Show In Folder = Arată în folder
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = USA
 Use UI background = Use UI background
 

assets/lang/ru_RU.ini

@@ -527,6 +527,8 @@ Remove From Recent = Удалить из недавних
 SaveData = Сохранения
 Setting Background = Установка фона
 Show In Folder = Показать в папке
+Time Played: %1h %2m %3s = Time Played: %1h %2m %3s
+Uncompressed = Uncompressed
 USA = США
 Use UI background = Использовать фон интерфейса
 

assets/lang/sv_SE.ini

@@ -528,6 +528,8 @@ Remove From Recent = Ta bort från "Senast spelat"
 SaveData = Sparad data
 Setting Background = Sätter UI-bakgrund
 Show In Folder = Visa i mapp
+Time Played: %1h %2m %3s = Spelad tid: %1h %2m %3s
+Uncompressed = Okomprimerat
 USA = USA
 Use UI background = Använd UI-bakgrund