From fdc831649fa7050d9679b7162c88448836c40a5f Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Wed, 8 Jun 2011 07:26:17 +0000
Subject: [PATCH] =?UTF-8?q?IVS->SDCI=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@334 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/Controller.cpp             |  2 +-
 .../sources/ConsoleBackup/Exporter.cpp               |  2 +-
 .../sources/ConsoleRestore/ConsoleRestore.cpp        |  2 +-
 .../sources/ConsoleRestore/Controller.cpp            | 12 ++++++------
 .../sources/ConsoleRestore/Importer.cpp              |  6 +++---
 .../sources/ConsoleRestore/Shop.h                    |  2 +-
 trunk/ConsoleDataMigration/sources/common/FileName.h |  2 +-
 .../sources/tests/common/util/test_Util.cpp          |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
index 43a50b6..c612f5e 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Controller.cpp
@@ -122,7 +122,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         else
         {
             error = true;
-            operationMessage.push_back(::std::string("Can't Read IVS!!"));
+            operationMessage.push_back(::std::string("Can't Read SDCI!!"));
         }
 
         // ACアダプタが必要か？
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
index 715b84d..d9186df 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
@@ -256,7 +256,7 @@ void WriteDeviceId(common::HardwareStateManager& manager)
 
 void WriteIvs(common::HardwareStateManager& manager)
 {
-    COMMON_LOGGER("Export IVS.\n");
+    COMMON_LOGGER("Export SDCI.\n");
 
     void* ivs;
     size_t size;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
index 547019f..13ff5a3 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp
@@ -305,7 +305,7 @@ extern "C" void nnMain(void)
             }
             else if (GetRestoreMode() == RESTORE_MODE_GET_IVS)
             {
-                s_RenderSystem.DrawText(0, lineBottom * spaceSize, "GET-IVS Mode");
+                s_RenderSystem.DrawText(0, lineBottom * spaceSize, "GET-SDCI Mode");
             }
             else if (GetRestoreMode() == RESTORE_MODE_CHECK_SD)
             {
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 2028656..4ef85f9 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -295,7 +295,7 @@ void CheckDownloadIvs(common::HardwareStateManager& manager, ::std::vector<std::
     }
     else
     {
-        COMMON_LOGGER("Download IVS\n");
+        COMMON_LOGGER("Download SDCI\n");
         s_RestoreState = DOWNLOAD_IVS;
     }
 
@@ -388,7 +388,7 @@ void CheckReadIvs(common::HardwareStateManager& manager, ::std::vector<std::stri
     else
     {
         s_RestoreState = FAIL;
-        COMMON_LOGGER("Can't Read IVS!!");
+        COMMON_LOGGER("Can't Read SDCI!!");
     }
 }
 
@@ -449,7 +449,7 @@ void CheckIvsinSd(common::HardwareStateManager& manager, ::std::vector<std::stri
     else
     {
         // 移行不能なのでFAIL
-        COMMON_LOGGER("Can't Read IVS in SD Card!!\n");
+        COMMON_LOGGER("Can't Read SDCI in SD Card!!\n");
         s_RestoreState = FAIL;
     }
 }
@@ -949,15 +949,15 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
 
         case DOWNLOAD_IVS:
         {
-            ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_GET_IVS, "Get Ivs",
-                    "Get Ivs Finished.\n", "Get Ivs Failed. Retrying...", DOWNLOAD_IVS_DONE);
+            ShopOperationSingleTemplate(manager, operationMessage, SHOP_OPERATION_GET_IVS, "Get SDCI",
+                    "Get SDCI Finished.\n", "Get SDCI Failed. Retrying...", DOWNLOAD_IVS_DONE);
         }
         break;
 
 
         case DOWNLOAD_IVS_DONE:
         {
-            operationMessage.push_back(::std::string("Get Ivs Done."));
+            operationMessage.push_back(::std::string("Get SDCI Done."));
             operationMessage.push_back(::std::string("Press A or START Button to Reboot"));
 
             if (!s_PlayedRebootCursor)
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index a7e66c0..7b114d3 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -658,7 +658,7 @@ nn::Result ImportIvs()
                             result = fos.TryWrite(&writeSize, dec, readSize, true);
                             if (result.IsSuccess())
                             {
-                                COMMON_LOGGER("Import IVS.\n");
+                                COMMON_LOGGER("Import SDCI.\n");
                             }
                         }
                     }
@@ -1366,7 +1366,7 @@ bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup)
             }
 
             {
-                const wchar_t* const GET_IVS_STR = L"GET_IVS";
+                const wchar_t* const GET_IVS_STR = L"GET_SDCI";
                 NN_NULL_ASSERT(getIvs);
                 if (configfileLoader.ReadAsChar(GET_IVS_STR) != NULL)
                 {
@@ -1374,7 +1374,7 @@ bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup)
                     if (num == 1)
                     {
                         *getIvs = true;
-                        COMMON_LOGGER("GET IVS Mode.\n");
+                        COMMON_LOGGER("GET SDCI Mode.\n");
                     }
                 }
             }
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
index 3840b31..1cf5eac 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.h
@@ -41,7 +41,7 @@ typedef enum SHOP_OPERATION
 const char* const SHOP_OPERATION_STR[] =
 {
     "Connect",
-    "Get Ivs",
+    "Get SDCI",
     "Unregister",
     "Force Unregister",
     "Connect Without Close",
diff --git a/trunk/ConsoleDataMigration/sources/common/FileName.h b/trunk/ConsoleDataMigration/sources/common/FileName.h
index 87f2926..0d45e9c 100644
--- a/trunk/ConsoleDataMigration/sources/common/FileName.h
+++ b/trunk/ConsoleDataMigration/sources/common/FileName.h
@@ -52,7 +52,7 @@ const wchar_t* const WRITE_FINISHED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/
 const wchar_t* const UPDATE_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/UpdateFinished";
 const wchar_t* const DELETE_ACCOUNT_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/AccountDeletedChecked";
 const wchar_t* const TRANSFER_ACCOUNT_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/AccountTransferedChecked";
-const wchar_t* const DOWNLOAD_IVS_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/DownloadIvsFinished";
+const wchar_t* const DOWNLOAD_IVS_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/DownloadSDCIFinished";
 const wchar_t* const INITIALIZED_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/ConsoleInitialized";
 const wchar_t* const RTC_SYNC_CHECK_PATHNAME = L"sdmc:/CTR_Console_Repair/RtcSyncFinished";
 const wchar_t* const PLAYHISTORY_PATHNAME = L"sdmc:/CTR_Console_Repair/playhistory.bin";
diff --git a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
index 1fa18c4..9910ec5 100644
--- a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
+++ b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp
@@ -109,7 +109,7 @@ void UtilTest::GetSaveDataDirectoryRoot()
             if (result.IsFailure())
             {
                 NN_DBG_PRINT_RESULT(result);
-                NN_TEST_FAIL("Can't Read IVS");
+                NN_TEST_FAIL("Can't Read SDCI");
             }
         }
         else