diff --git a/plugins/builtin/romfs/lang/de_DE.json b/plugins/builtin/romfs/lang/de_DE.json index 712bfeddd..65a94d4cf 100644 --- a/plugins/builtin/romfs/lang/de_DE.json +++ b/plugins/builtin/romfs/lang/de_DE.json @@ -653,7 +653,7 @@ "hex.builtin.view.hex_editor.copy.crystal": "Crystal Array", "hex.builtin.view.hex_editor.copy.csharp": "C# Array", "hex.builtin.view.hex_editor.copy.go": "Go Array", - "hex.builtin.view.hex_editor.copy.hex": "Hex String", + "hex.builtin.view.hex_editor.copy.ascuu": "Hex String", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java Array", "hex.builtin.view.hex_editor.copy.js": "JavaScript Array", diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json index 6fc3c775b..27e358458 100644 --- a/plugins/builtin/romfs/lang/en_US.json +++ b/plugins/builtin/romfs/lang/en_US.json @@ -649,14 +649,14 @@ "hex.builtin.view.help.name": "Help", "hex.builtin.view.help.pattern_cheat_sheet": "Pattern Language Cheat Sheet", "hex.builtin.view.hex_editor.copy.address": "Address", - "hex.builtin.view.hex_editor.copy.ascii": "Text Area", + "hex.builtin.view.hex_editor.copy.ascii": "ASCII String", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C Array", "hex.builtin.view.hex_editor.copy.cpp": "C++ Array", "hex.builtin.view.hex_editor.copy.crystal": "Crystal Array", "hex.builtin.view.hex_editor.copy.csharp": "C# Array", "hex.builtin.view.hex_editor.copy.go": "Go Array", - "hex.builtin.view.hex_editor.copy.hex": "Hex String", + "hex.builtin.view.hex_editor.copy.hex_view": "Hex View", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java Array", "hex.builtin.view.hex_editor.copy.js": "JavaScript Array", diff --git a/plugins/builtin/romfs/lang/it_IT.json b/plugins/builtin/romfs/lang/it_IT.json index e38723e46..fd73260f1 100644 --- a/plugins/builtin/romfs/lang/it_IT.json +++ b/plugins/builtin/romfs/lang/it_IT.json @@ -646,14 +646,12 @@ "hex.builtin.view.help.name": "Aiuto", "hex.builtin.view.help.pattern_cheat_sheet": "Pattern Language Cheat Sheet", "hex.builtin.view.hex_editor.copy.address": "***** MISSING TRANSLATION *****", - "hex.builtin.view.hex_editor.copy.ascii": "***** MISSING TRANSLATION *****", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C Array", "hex.builtin.view.hex_editor.copy.cpp": "C++ Array", "hex.builtin.view.hex_editor.copy.crystal": "Crystal Array", "hex.builtin.view.hex_editor.copy.csharp": "C# Array", "hex.builtin.view.hex_editor.copy.go": "Go Array", - "hex.builtin.view.hex_editor.copy.hex": "Hex Stringa", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java Array", "hex.builtin.view.hex_editor.copy.js": "JavaScript Array", diff --git a/plugins/builtin/romfs/lang/ja_JP.json b/plugins/builtin/romfs/lang/ja_JP.json index 2be3cac43..031d3371b 100644 --- a/plugins/builtin/romfs/lang/ja_JP.json +++ b/plugins/builtin/romfs/lang/ja_JP.json @@ -646,14 +646,12 @@ "hex.builtin.view.help.name": "ヘルプ", "hex.builtin.view.help.pattern_cheat_sheet": "パターン言語リファレンス", "hex.builtin.view.hex_editor.copy.address": "***** MISSING TRANSLATION *****", - "hex.builtin.view.hex_editor.copy.ascii": "***** MISSING TRANSLATION *****", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C 配列", "hex.builtin.view.hex_editor.copy.cpp": "C++ 配列", "hex.builtin.view.hex_editor.copy.crystal": "Crystal 配列", "hex.builtin.view.hex_editor.copy.csharp": "C# 配列", "hex.builtin.view.hex_editor.copy.go": "Go 配列", - "hex.builtin.view.hex_editor.copy.hex": "文字列", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java 配列", "hex.builtin.view.hex_editor.copy.js": "JavaScript 配列", diff --git a/plugins/builtin/romfs/lang/ko_KR.json b/plugins/builtin/romfs/lang/ko_KR.json index 46fc673ec..447582fcc 100644 --- a/plugins/builtin/romfs/lang/ko_KR.json +++ b/plugins/builtin/romfs/lang/ko_KR.json @@ -646,14 +646,12 @@ "hex.builtin.view.help.name": "도움말", "hex.builtin.view.help.pattern_cheat_sheet": "패턴 언어 치트시트", "hex.builtin.view.hex_editor.copy.address": "***** MISSING TRANSLATION *****", - "hex.builtin.view.hex_editor.copy.ascii": "***** MISSING TRANSLATION *****", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C 배열", "hex.builtin.view.hex_editor.copy.cpp": "C++ 배열", "hex.builtin.view.hex_editor.copy.crystal": "Crystal 배열", "hex.builtin.view.hex_editor.copy.csharp": "C# 배열", "hex.builtin.view.hex_editor.copy.go": "Go 배열", - "hex.builtin.view.hex_editor.copy.hex": "문자열", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java 배열", "hex.builtin.view.hex_editor.copy.js": "JavaScript 배열", diff --git a/plugins/builtin/romfs/lang/pt_BR.json b/plugins/builtin/romfs/lang/pt_BR.json index e7deee250..3ce860c9a 100644 --- a/plugins/builtin/romfs/lang/pt_BR.json +++ b/plugins/builtin/romfs/lang/pt_BR.json @@ -646,14 +646,12 @@ "hex.builtin.view.help.name": "Ajuda", "hex.builtin.view.help.pattern_cheat_sheet": "Pattern Language Cheat Sheet", "hex.builtin.view.hex_editor.copy.address": "***** MISSING TRANSLATION *****", - "hex.builtin.view.hex_editor.copy.ascii": "***** MISSING TRANSLATION *****", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C Array", "hex.builtin.view.hex_editor.copy.cpp": "C++ Array", "hex.builtin.view.hex_editor.copy.crystal": "Crystal Array", "hex.builtin.view.hex_editor.copy.csharp": "C# Array", "hex.builtin.view.hex_editor.copy.go": "Go Array", - "hex.builtin.view.hex_editor.copy.hex": "String", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java Array", "hex.builtin.view.hex_editor.copy.js": "JavaScript Array", diff --git a/plugins/builtin/romfs/lang/zh_TW.json b/plugins/builtin/romfs/lang/zh_TW.json index 7e388740c..063adbeeb 100644 --- a/plugins/builtin/romfs/lang/zh_TW.json +++ b/plugins/builtin/romfs/lang/zh_TW.json @@ -646,14 +646,12 @@ "hex.builtin.view.help.name": "幫助", "hex.builtin.view.help.pattern_cheat_sheet": "模式語言小抄", "hex.builtin.view.hex_editor.copy.address": "地址", - "hex.builtin.view.hex_editor.copy.ascii": "文字區域", "hex.builtin.view.hex_editor.copy.base64": "Base64", "hex.builtin.view.hex_editor.copy.c": "C 陣列", "hex.builtin.view.hex_editor.copy.cpp": "C++ 陣列", "hex.builtin.view.hex_editor.copy.crystal": "Crystal 陣列", "hex.builtin.view.hex_editor.copy.csharp": "C# 陣列", "hex.builtin.view.hex_editor.copy.go": "Go 陣列", - "hex.builtin.view.hex_editor.copy.hex": "字串", "hex.builtin.view.hex_editor.copy.html": "HTML", "hex.builtin.view.hex_editor.copy.java": "Java 陣列", "hex.builtin.view.hex_editor.copy.js": "JavaScript 陣列", diff --git a/plugins/builtin/source/content/data_formatters.cpp b/plugins/builtin/source/content/data_formatters.cpp index 0c222ac36..96614450e 100644 --- a/plugins/builtin/source/content/data_formatters.cpp +++ b/plugins/builtin/source/content/data_formatters.cpp @@ -100,7 +100,7 @@ namespace hex::plugin::builtin { return std::string(result.begin(), result.end()); }); - ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.ascii", [](prv::Provider *provider, u64 offset, size_t size) { + ContentRegistry::DataFormatter::add("hex.builtin.view.hex_editor.copy.hex_view", [](prv::Provider *provider, u64 offset, size_t size) { constexpr static auto HeaderLine = "Hex View 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n"; std::string result; result.reserve(std::string(HeaderLine).size() * size / 0x10); diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp index e36949aa1..7df5f670c 100644 --- a/plugins/builtin/source/content/views/view_hex_editor.cpp +++ b/plugins/builtin/source/content/views/view_hex_editor.cpp @@ -669,7 +669,7 @@ namespace hex::plugin::builtin { std::string buffer(selection.size, 0x00); buffer.reserve(selection.size); - provider->read(selection.getStartAddress() + provider->getBaseAddress() + provider->getCurrentPageAddress(), buffer.data(), selection.size); + provider->read(selection.getStartAddress(), buffer.data(), selection.size); ImGui::SetClipboardText(buffer.c_str()); } @@ -980,7 +980,7 @@ namespace hex::plugin::builtin { copyBytes(*selection); if (ImGui::BeginMenu("hex.builtin.view.hex_editor.menu.edit.copy_as"_lang, selection.has_value() && providerValid)) { - if (ImGui::MenuItem("hex.builtin.view.hex_editor.copy.hex"_lang, (CTRLCMD_NAME + " + "s + SHIFT_NAME + " + C"s).c_str())) + if (ImGui::MenuItem("hex.builtin.view.hex_editor.copy.ascii"_lang, (CTRLCMD_NAME + " + "s + SHIFT_NAME + " + C"s).c_str())) copyString(*selection); if (ImGui::MenuItem("hex.builtin.view.hex_editor.copy.address"_lang)) ImGui::SetClipboardText(hex::format("0x{:08X}", selection->getStartAddress()).c_str());