Merge pull request #359 from 173210/master

Fix rxtools

lang/en.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "English",
 	"BACKING_UP": "Backing up %ls...\n",
-	"DELETING": "Deleting %s...\n",
+	"DELETING": "Deleting %ls...\n",
 	"DOWNGRADE": "Downgrade %ls",
 	"DOWNGRADING": "Downgrading %ls...\n",
 	"DOWNGRADING_NOT_NEEDED": "Downgrading %ls not needed.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "Injecting\n%ls\nto %ls...\n",
 	"DECRYPT": "Decrypt %ls",
 	"DECRYPTING": "Decrypting %ls...\n",
-	"DECRYPTING_TO": "Decrypting %ls to\n%s...\n",
 	"DECRYPTED": "Decrypted %d %ls\n", 
 	"GENERATE": "Generate %ls",
 	"GENERATING": "Generating %ls...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "Load %ls",
 	"DIRECTORY": "Directory: %ls",
 	"MISSING": "Missing %ls!\n",
-	"ERROR_OPENING": "Error opening %s!\n",
-	"ERROR_CREATING": "Error creating %s!\n",
-	"ERROR_READING": "Error reading %s!\n",
-	"ERROR_WRITING": "Error writing %s!\n",
-	"ERROR_COPYING": "Error copying %s to %s!\n",
-	"WRONG": "Wrong %s %ls!\n",
+	"ERROR_OPENING": "Error opening %ls!\n",
+	"ERROR_CREATING": "Error creating %ls!\n",
+	"ERROR_READING": "Error reading %ls!\n",
+	"ERROR_WRITING": "Error writing %ls!\n",
+	"ERROR_COPYING": "Error copying %ls to %ls!\n",
+	"WRONG": "Wrong %ls %ls!\n",
 	"GOT": "Got %ls\n",
 	"EXPECTED": "Expected %ls\n",
 	"VERSION": "version",

lang/es.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "Español",
 	"BACKING_UP": "Respaldando %ls...\n",
-	"DELETING": "Eliminando %s...\n",
+	"DELETING": "Eliminando %ls...\n",
 	"DOWNGRADE": "Downgrade de %ls",
 	"DOWNGRADING": "Efectuando downgrade %ls...\n",
 	"DOWNGRADING_NOT_NEEDED": "El downgrade de %ls no es necesario.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "Inyectando\n%ls\na %ls...\n",
 	"DECRYPT": "Desencriptar %ls",
 	"DECRYPTING": "Desencriptando %ls...\n",
-	"DECRYPTING_TO": "Desencriptando %ls a\n%s...\n",
 	"DECRYPTED": "Desencriptado(s) %d %ls\n", 
 	"GENERATE": "Generar %ls",
 	"GENERATING": "Generando %ls...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "Cargar %ls",
 	"DIRECTORY": "Directorio: %ls",
 	"MISSING": "¡No existe %ls!\n",
-	"ERROR_OPENING": "¡Imposible abrir %s!\n",
-	"ERROR_CREATING": "!Imposible crear %s!\n",
-	"ERROR_READING": "!Imposible leer %s!\n",
-	"ERROR_WRITING": "¡Imposible escribir %s!\n",
-	"ERROR_COPYING": "¡Imposible copiar %s a %s!\n",
-	"WRONG": "%s ¡%ls incorrecto(a)!\n",
+	"ERROR_OPENING": "¡Imposible abrir %ls!\n",
+	"ERROR_CREATING": "!Imposible crear %ls!\n",
+	"ERROR_READING": "!Imposible leer %ls!\n",
+	"ERROR_WRITING": "¡Imposible escribir %ls!\n",
+	"ERROR_COPYING": "¡Imposible copiar %ls a %ls!\n",
+	"WRONG": "%ls ¡%ls incorrecto(a)!\n",
 	"GOT": "Obtenida: %ls\n",
 	"EXPECTED": "Esperada: %ls\n",
 	"VERSION": "versión",

lang/fr.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "Français",
 	"BACKING_UP": "Sauvegarde de %ls...\n",
-	"DELETING": "Effacement de %s...\n",
+	"DELETING": "Effacement de %ls...\n",
 	"DOWNGRADE": "Downgrade %ls",
 	"DOWNGRADING": "Downgrade de %ls...\n",
 	"DOWNGRADING_NOT_NEEDED": "Downgrade de %ls non nécessaire.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "Injection de\n%ls\nvers %ls...\n",
 	"DECRYPT": "Décrypte %ls",
 	"DECRYPTING": "Décryptage de %ls...\n",
-	"DECRYPTING_TO": "Décrypte %ls\nvers %s...\n",
 	"DECRYPTED": "Décrypter %d %ls\n", 
 	"GENERATE": "Génère %ls",
 	"GENERATING": "Génération de %ls...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "Charger %ls",
 	"DIRECTORY": "Répertoires: %ls",
 	"MISSING": "%ls manquant!\n",
-	"ERROR_OPENING": "Erreur ouverture %s!\n",
-	"ERROR_CREATING": "Erreur création %s!\n",
-	"ERROR_READING": "Erreur lecture %s!\n",
-	"ERROR_WRITING": "Erreur écriture %s!\n",
-	"ERROR_COPYING": "Erreur copie %s vers %s!\n",
-	"WRONG": "Mauvais %s %ls!\n",
+	"ERROR_OPENING": "Erreur ouverture %ls!\n",
+	"ERROR_CREATING": "Erreur création %ls!\n",
+	"ERROR_READING": "Erreur lecture %ls!\n",
+	"ERROR_WRITING": "Erreur écriture %ls!\n",
+	"ERROR_COPYING": "Erreur copie %ls vers %ls!\n",
+	"WRONG": "Mauvais %ls %ls!\n",
 	"GOT": "obtenu %ls\n",
 	"EXPECTED": "Attendu %ls\n",
 	"VERSION": "version",

lang/it.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "Italian",
 	"BACKING_UP": "Sto backuppando %ls...\n",
-	"DELETING": "Sto cancellando %s...\n",
+	"DELETING": "Sto cancellando %ls...\n",
 	"DOWNGRADE": "Fai il downgrade di %ls",
 	"DOWNGRADING": "Sto downgradando %ls...\n",
 	"DOWNGRADING_NOT_NEEDED": "Downgrade di %ls non necessario.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "Sto iniettando\n%ls\nsu %ls...\n",
 	"DECRYPT": "Decripta %ls",
 	"DECRYPTING": "Sto decriptando %ls...\n",
-	"DECRYPTING_TO": "Sto decriptando %ls su\n%s...\n",
 	"DECRYPTED": "Decriptato %d %ls\n", 
 	"GENERATE": "Genera %ls",
 	"GENERATING": "Sto generando %ls...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "Carica %ls",
 	"DIRECTORY": "Cartella: %ls",
 	"MISSING": "%ls!\n mancante!",
-	"ERROR_OPENING": "Impossibile aprire %s!\n",
-	"ERROR_CREATING": "Impossibile creare %s!\n",
-	"ERROR_READING": "Impossibile leggere %s!\n",
-	"ERROR_WRITING": "Impossibile scrivere %s!\n",
-	"ERROR_COPYING": "Impossibile copiare %s su %s!\n",
-	"WRONG": "%s sbagliato %ls!\n",
+	"ERROR_OPENING": "Impossibile aprire %ls!\n",
+	"ERROR_CREATING": "Impossibile creare %ls!\n",
+	"ERROR_READING": "Impossibile leggere %ls!\n",
+	"ERROR_WRITING": "Impossibile scrivere %ls!\n",
+	"ERROR_COPYING": "Impossibile copiare %ls su %ls!\n",
+	"WRONG": "%ls sbagliato %ls!\n",
 	"GOT": "Ottenuto %ls\n",
 	"EXPECTED": "Aspettato %ls\n",
 	"VERSION": "versione",

lang/ko.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "한국어",
 	"BACKING_UP": "%ls 백업 중...\n",
-	"DELETING": "%s 삭제 중...\n",
+	"DELETING": "%ls 삭제 중...\n",
 	"DOWNGRADE": "%ls 다운그레이드",
 	"DOWNGRADING": "%ls 다운그레이드 중...\n",
 	"DOWNGRADING_NOT_NEEDED": "%ls 다운그레이드 불필요.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "%ls \n%ls에\n삽입 중...\n",
 	"DECRYPT": "%ls 복호화",
 	"DECRYPTING": "%ls 복호화 중...\n",
-	"DECRYPTING_TO": "%ls를 \n%s에 복호화 중...\n",
 	"DECRYPTED": "%d %ls 복호화 완료\n", 
 	"GENERATE": "%ls 생성",
 	"GENERATING": "%ls 생성 중...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "%ls 로드",
 	"DIRECTORY": "경로: %ls",
 	"MISSING": "%ls 파일 없음!\n",
-	"ERROR_OPENING": "%s 열기 오류!\n",
-	"ERROR_CREATING": "%s 생성 오류!\n",
-	"ERROR_READING": "%s 읽기 오류!\n",
-	"ERROR_WRITING": "%s 쓰기 오류!\n",
-	"ERROR_COPYING": "%s를 %s에 복사 중 오류!\n",
-	"WRONG": "%s %ls 손상!\n",
+	"ERROR_OPENING": "%ls 열기 오류!\n",
+	"ERROR_CREATING": "%ls 생성 오류!\n",
+	"ERROR_READING": "%ls 읽기 오류!\n",
+	"ERROR_WRITING": "%ls 쓰기 오류!\n",
+	"ERROR_COPYING": "%ls를 %ls에 복사 중 오류!\n",
+	"WRONG": "%ls %ls 손상!\n",
 	"GOT": "%ls 얻음\n",
 	"EXPECTED": "%ls 예상\n",
 	"VERSION": "버전",

lang/pt.json

@@ -12,9 +12,8 @@
 	"DECRYPT": "Decriptar %ls",
 	"DECRYPTED": "%d %ls foi Decriptado\n", 
 	"DECRYPTING": "Decriptando %ls...\n",
-	"DECRYPTING_TO": "Decriptando %ls em\n%s...\n",
 	"DELETE": "excluir",
-	"DELETING": "Excluindo %s...\n",
+	"DELETING": "Excluindo %ls...\n",
 	"DIRECTORY": "Diretório: %ls",
 	"DOWNGRADE": "Downgrade de %ls",
 	"DOWNGRADE_PACK": "pacote de downgrade",
@@ -24,11 +23,11 @@
 	"DUMPING": "Extraindo %ls em\n%ls...\n",
 	"ENABLE_3D_UI": "Ativar UI 3D           %ls",
 	"ENTRIES_COUNT": "número de elementos",
-	"ERROR_COPYING": "Erro ao copiar %s para %s!\n",
-	"ERROR_CREATING": "Erro ao criar %s!\n",
-	"ERROR_OPENING": "Erro ao abrir %s!\n",
-	"ERROR_READING": "Erro ao ler %s!\n",
-	"ERROR_WRITING": "Erro ao gravar %s!\n",
+	"ERROR_COPYING": "Erro ao copiar %ls para %ls!\n",
+	"ERROR_CREATING": "Erro ao criar %ls!\n",
+	"ERROR_OPENING": "Erro ao abrir %ls!\n",
+	"ERROR_READING": "Erro ao ler %ls!\n",
+	"ERROR_WRITING": "Erro ao gravar %ls!\n",
 	"EXPECTED": "Esperado %ls\n",
 	"FAILED": "Falhou!\n",
 	"FILES": "arquivos",
@@ -80,7 +79,7 @@
 	"VERSION": "versão",
 	"VERSION_OF": "Versão do %ls: %u\n",
 	"WARNING": "Aviso",
-	"WRONG": "%s %ls incorreto!\n",
+	"WRONG": "%ls %ls incorreto!\n",
 	"YES": "Sim",
 	"RANDOM_THEME": "Tema aleatório"
 }

lang/ru.json

@@ -1,7 +1,7 @@
 {
 	"LANG_NAME": "Русский",
 	"BACKING_UP": "Резервное копирование %ls...\n",
-	"DELETING": "Удаление %s...\n",
+	"DELETING": "Удаление %ls...\n",
 	"DOWNGRADE": "Откат версии %ls",
 	"DOWNGRADING": "Откатывается версия %ls...\n",
 	"DOWNGRADING_NOT_NEEDED": "Откат версии %ls не требуется.\n",
@@ -11,7 +11,6 @@
 	"INJECTING": "Заменяется из\n%ls\nв %ls...\n",
 	"DECRYPT": "Расшифровывание %ls",
 	"DECRYPTING": "Расшифровывание %ls...\n",
-	"DECRYPTING_TO": "Расшифровывание %ls в\n%s...\n",
 	"DECRYPTED": "Расшифровано %d %ls\n", 
 	"GENERATE": "Создать %ls",
 	"GENERATING": "Создается %ls...\n",
@@ -22,12 +21,12 @@
 	"LOAD": "Загрузка %ls",
 	"DIRECTORY": "Папка: %ls",
 	"MISSING": "Отсутствует %ls!\n",
-	"ERROR_OPENING": "Ошибка открытия %s!\n",
-	"ERROR_CREATING": "Ошибка создания %s!\n",
-	"ERROR_READING": "Ошибка чтения %s!\n",
-	"ERROR_WRITING": "Ошибка записи %s!\n",
-	"ERROR_COPYING": "Ошибка копирования %s в %s!\n",
-	"WRONG": "Неверный %s %ls!\n",
+	"ERROR_OPENING": "Ошибка открытия %ls!\n",
+	"ERROR_CREATING": "Ошибка создания %ls!\n",
+	"ERROR_READING": "Ошибка чтения %ls!\n",
+	"ERROR_WRITING": "Ошибка записи %ls!\n",
+	"ERROR_COPYING": "Ошибка копирования %ls в %ls!\n",
+	"WRONG": "Неверный %ls %ls!\n",
 	"GOT": "Получено %ls\n",
 	"EXPECTED": "Требуется %ls\n",
 	"VERSION": "версия",

lang/zh-CN.json

@@ -1,7 +1,7 @@
 {
     "LANG_NAME": "简体中文", 
     "BACKING_UP": "正在备份 %ls...\n", 
-    "DELETING": "正在删除 %s...\n", 
+    "DELETING": "正在删除 %ls...\n", 
     "DOWNGRADE": "降级 %ls", 
     "DOWNGRADING": "正在降级 %ls...\n", 
     "DOWNGRADING_NOT_NEEDED": "不需要降级 %ls.\n", 
@@ -11,7 +11,6 @@
     "INJECTING": "正在注入\n%ls\n到 %ls...\n",
     "DECRYPT": "解密 %ls", 
     "DECRYPTING": "正在解密 %ls...\n", 
-    "DECRYPTING_TO": "正在解密 %ls\n到 %s...\n", 
     "DECRYPTED": "已解密了 %d 个 %ls\n", 
     "GENERATE": "生成 %ls", 
     "GENERATING": "正在生成 %ls...\n", 
@@ -22,12 +21,12 @@
     "LOAD": "读取 %ls", 
     "DIRECTORY": "文件夹: %ls", 
     "MISSING": "缺少 %ls!\n", 
-    "ERROR_OPENING": "打开 %s 失败!\n", 
-    "ERROR_CREATING": "创建 %s 失败!\n", 
-    "ERROR_READING": "读取 %s 失败!\n", 
-    "ERROR_WRITING": "写入 %s 失败!\n", 
-    "ERROR_COPYING": "复制 %s 到 %s 失败!\n", 
-    "WRONG": "%s %ls 错误!\n", 
+    "ERROR_OPENING": "打开 %ls 失败!\n", 
+    "ERROR_CREATING": "创建 %ls 失败!\n", 
+    "ERROR_READING": "读取 %ls 失败!\n", 
+    "ERROR_WRITING": "写入 %ls 失败!\n", 
+    "ERROR_COPYING": "复制 %ls 到 %ls 失败!\n", 
+    "WRONG": "%ls %ls 错误!\n", 
     "GOT": "获得值 %ls\n", 
     "EXPECTED": "期望值 %ls\n", 
     "VERSION": "版本号", 

lang/zh-TW.json

@@ -1,7 +1,7 @@
 {
     "LANG_NAME": "正體中文", 
     "BACKING_UP": "正在備份 %ls...\n", 
-    "DELETING": "正在移除 %s...\n", 
+    "DELETING": "正在移除 %ls...\n", 
     "DOWNGRADE": "降級 %ls", 
     "DOWNGRADING": "正在降級 %ls...\n", 
     "DOWNGRADING_NOT_NEEDED": "無須降級 %ls.\n", 
@@ -11,7 +11,6 @@
     "INJECTING": "正在注入\n%ls\n到 %ls...\n",
     "DECRYPT": "解密 %ls", 
     "DECRYPTING": "正在解密 %ls...\n", 
-    "DECRYPTING_TO": "正在解密 %ls\n 到 %s...\n", 
     "DECRYPTED": "已解密 %d 個 %ls\n", 
     "GENERATE": "產生 %ls", 
     "GENERATING": "正在產生 %ls...\n", 
@@ -22,12 +21,12 @@
     "LOAD": "讀入 %ls", 
     "DIRECTORY": "資料夾: %ls", 
     "MISSING": "缺少 %ls!\n", 
-    "ERROR_OPENING": "打開 %s 失敗!\n", 
-    "ERROR_CREATING": "創建 %s 失敗!\n", 
-    "ERROR_READING": "讀取 %s 失敗!\n", 
-    "ERROR_WRITING": "寫入 %s 失敗!\n", 
-    "ERROR_COPYING": "複製 %s 到 %s 失敗!\n", 
-    "WRONG": "%s %ls 錯誤!\n", 
+    "ERROR_OPENING": "打開 %ls 失敗!\n", 
+    "ERROR_CREATING": "創建 %ls 失敗!\n", 
+    "ERROR_READING": "讀取 %ls 失敗!\n", 
+    "ERROR_WRITING": "寫入 %ls 失敗!\n", 
+    "ERROR_COPYING": "複製 %ls 到 %ls 失敗!\n", 
+    "WRONG": "%ls %ls 錯誤!\n", 
     "GOT": "獲取值 %ls\n", 
     "EXPECTED": "期望值 %ls\n", 
     "VERSION": "版本", 

rxtools/source/features/NandDumper.c

@@ -74,7 +74,7 @@ void NandDumper(){
 		wcscat(ProgressBar, strings[STR_PROGRESS]);
 	unsigned int progress = 0;
 	wchar_t filename[_MAX_LFN];
-	swprintf(filename, _MAX_LFN, L"rxTools/nand/%sNAND.bin",
+	swprintf(filename, _MAX_LFN, L"rxTools/nand/%lsNAND.bin",
 		isEmuNand ? L"EMU" : L"");
 	if(FileOpen(&myFile, filename, 1)){
 		print(strings[STR_DUMPING], isEmuNand ? strings[STR_EMUNAND] : strings[STR_SYSNAND], filename);

rxtools/source/features/TitleKeyDecrypt.c

@@ -258,14 +258,14 @@ void DecryptTitleKeyFile(void) {
 			percent++;
 			wcsncpy(progress, strings[STR_PROGRESS_OK], wcslen(strings[STR_PROGRESS_OK]));
 			progress += wcslen(strings[STR_PROGRESS_OK]);
-			print(L"\r%s", progressbar);
+			print(L"\r%ls", progressbar);
 			ConsoleShow();
 		}
 	}
 	percent++;
 	wcsncpy(progress, strings[STR_PROGRESS_OK], wcslen(strings[STR_PROGRESS_OK]));
 	progress += wcslen(strings[STR_PROGRESS_OK]);
-	print(L"\r%s\n", progressbar);
+	print(L"\r%ls\n", progressbar);
 	ConsoleShow();
 	rr = f_write(&dump, line, sizeof(line), &br);
 	if ((rr != FR_OK)||(br != sizeof(line)))