diff --git a/lang/en_US.ts b/lang/en_US.ts
index 1cb5ab4..acc7497 100644
--- a/lang/en_US.ts
+++ b/lang/en_US.ts
@@ -139,297 +139,454 @@
- MainWindow
+ MF_trailerDecoderDialog
-
- Proxmark3GUI
+
+ Trailer Decoder
-
- Path:
+
+ Blocks
-
- Refresh
+
+ 4
-
- Connect
+
+ 16
-
- Disconnect
+
+ Trailer Data:
+(like "FF0780" or "FF 07 80")
-
- Mifare
+
+ Or set bits manually
+
+
+
+
+ Cx0
+
+
+
+
+ Cx1
+
+
+
+
+ Cx2
+
+
+
+
+ Cx3
+
+
+
+
+ Data Block Permission:
+
+
+
+
+ Block0
+
+
+
+
+ Block1
+
+
+
+
+ Block2
+
+
+
+
+
+ Read
+
+
+
+
+
+ Write
+
+
+
+
+ Increase
+
+
+
+
+ Decrease/Transfer/Restore
+
+
+
+
+ Trailer Block Permission:
+
+
+
+
+ KeyA
+
+
+
+
+ Access Bits
+
+
+
+
+ KeyB
+
+
+
+
+ Reference:
+MF1S70YYX_V1 Product data sheet
+Rev. 3.2 — 23 November 2017
+
+
+
+
+ Note:the Access Bits usually contains 4 bytes(8 hex symbols), but only the first 3 bytes matters. You can set the 4th byte randomly.
+
+
+
+
+ Invalid!
+It could make the whole sector blocked irreversibly!
+
+
+
+
+ Valid
+
+
+
+
+ MainWindow
+
+
+ Proxmark3GUI
-
- >>
+
+ Path:
-
- <<
+
+ Refresh
-
- F
+
+ Connect
-
+
+ Disconnect
+
+
+
+
+ Mifare
+
+
+
+
Card Type
-
+
MINI
+ 320
-
+
1K
+ 1024
-
+
2K
+ 2048
-
+
4K
+ 4096
-
+
File
-
-
+
+
Load
-
-
+
+
Save
-
-
+
+
Data
-
+
Key
-
+
Attack
-
+
Card Info
-
+
Check Default
-
+
Nested
-
+
Hardnested
-
+
Read/Write
-
+
Block:
-
+
Key:
-
+
Key Type:
-
- A
+
+ Snoop
-
- B
+
+ List Data
-
+
Data:
-
+
Normal(Require Password)
-
-
- Read Block
-
-
-
-
-
- Write Block
-
-
-
-
-
-
+
Read All
-
-
- Write All
-
-
-
-
+
Dump
-
+
Restore
-
+
Chinese Magic Card(Without Password)
-
+
Lock UFUID Card
-
-
+
+
About UID Card
-
+
Set Parameter
-
+
Wipe
-
-
+
+
Simulate
-
+
Load from data above
-
-
+
+
Clear
-
-
- Sniff
+
+ Select All
+
+
+
+
+ KeyBlocks->Key
+
+
+
+
+ KeyBlocks<-Key
+
+
+
+
+ Fill Keys
+
+
+
+
+ Trailer Decoder
+
+
+
+
+ Set Fonts
+
+
+
+
+
+ Read One
+
+
+
+
+
+ Write One
+
+
+
+
+
+ Read Selected
+
+
+
+
+
+ Write Selected
-
- List Sniff Data
+
+
+ Sniff
-
+
RawCommand
-
-
+
+
History:
-
+
ClearHistory
-
+
Send
-
+
ClearOutput
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Info
@@ -439,246 +596,246 @@
-
+
Connected
-
-
-
+
+
+
Not Connected
-
+
Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml);;All Files(*.*)
-
-
-
+
+
+
Failed to open
-
- When Changeing card type, the data and keys in this app will be cleard.
+
+ Continue?
-
- Continue?
+
+ Some of the data and key will be cleared.
-
+
Plz select the font of data widget and key widget
-
+
Data must consists of 32 Hex symbols(Whitespace is allowed)
-
-
+
+
Key must consists of 12 Hex symbols(Whitespace is allowed)
-
+
Plz select the data file:
-
+
Plz select the key file:
-
+
Binary Key Files(*.bin *.dump);;Binary Data Files(*.bin *.dump);;All Files(*.*)
-
+
Plz select the location to save data file:
-
+
Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml)
-
-
-
+
+
+
Failed to save to
-
+
Plz select the location to save key file:
-
+
Binary Key Files(*.bin *.dump)
-
+
Normally, the Block 0 of a typical Mifare card, which contains the UID, is locked during the manufacture. Users cannot write anything to Block 0 or set a new UID to a normal Mifare card.
-
+
Chinese Magic Cards(aka UID Cards) are some special cards whose Block 0 are writeable. And you can change UID by writing to it.
-
+
There are two versions of Chinese Magic Cards, the Gen1 and the Gen2.
-
+
Gen1:
-
+
also called UID card in China. It responses to some backdoor commands so you can access any blocks without password. The Proxmark3 has a bunch of related commands(csetblk, cgetblk, ...) to deal with this type of card, and my GUI also support these commands.
-
+
Gen2:
-
+
doesn't response to the backdoor commands, which means that a reader cannot detect whether it is a Chinese Magic Card or not by sending backdoor commands.
-
+
There are some types of Chinese Magic Card Gen2.
-
+
CUID Card:
-
+
the Block 0 is writeable, you can write to this block repeatedly by normal wrbl command.
-
+
(hf mf wrbl 0 A FFFFFFFFFFFF <the data you want to write>)
-
+
FUID Card:
-
+
you can only write to Block 0 once. After that, it seems like a typical Mifare card(Block 0 cannot be written to).
-
+
(some readers might try changing the Block 0, which could detect the CUID Card. In that case, you should use FUID card.)
-
+
UFUID Card:
-
+
It behaves like a CUID card(or UID card? I'm not sure) before you send some special command to lock it. Once it is locked, you cannot change its Block 0(just like a typical Mifare card).
-
+
Seemingly, these Chinese Magic Cards are more easily to be compromised by Nested Attack(it takes little time to get an unknown key).
-
+
Plz select the trace file:
-
+
Trace Files(*.trc);;All Files(*.*)
-
+
Plz select the location to save trace file:
-
+
Trace Files(*.trc)
-
-
+
+
Idle
-
-
+
+
Sec
-
+
Blk
-
+
KeyA
-
+
KeyB
-
+
HW Version:
-
+
PM3:
-
+
State:
-
+
Running
@@ -686,28 +843,35 @@
Mifare
-
-
+
+
Success!
-
-
-
-
-
+
+
+
+
+
+
Info
-
-
+
+ Plz provide at least one known key
+
+
+
+
+
+
Failed!
-
+
Failed to read card.
diff --git a/lang/zh_CN.ts b/lang/zh_CN.ts
index 3ae33f8..2035f0b 100644
--- a/lang/zh_CN.ts
+++ b/lang/zh_CN.ts
@@ -8,10 +8,6 @@
Hardnested Attack
Hardnested攻击
-
- Known Key:
- 已知Key：
-
Known Block:
@@ -40,17 +36,9 @@
Target Block:
目标块：
-
- Target Block:
- 目标块：
-
MF_Sim_simDialog
-
- Dialog
- 对话框
-
Simulate
@@ -126,17 +114,9 @@
Generate random nonces instead of sequential nonces. Standard reader attack won't work with this option, only moebius attack works
生成随机nonce而不是顺序的nonce，这种情况下PM3将不对读卡器进行标准攻击，只进行moebius攻击
-
- Generate random nonces instead of sequential nonces. Standard reader attack won't work with this option, only moebius attack works.
- 生成随机nonce而不是顺序的nonce，这种情况下PM3将不对读卡器进行标准攻击，只进行moebius攻击
-
MF_UID_parameterDialog
-
- Dialog
- 对话框
-
Set Parameter
@@ -157,9 +137,148 @@
SAK:
+
+
+ MF_trailerDecoderDialog
+
+
+ Trailer Decoder
+ Trailer解码
+
+
+
+ Blocks
+ 块大小
+
+
+
+ 4
+
+
+
+
+ 16
+
+
+
+
+ Trailer Data:
+(like "FF0780" or "FF 07 80")
+ 输入Access Bits
+（形如“FF0780”或“FF 07 80”）
+
+
+
+ Or set bits manually
+ 手动设置访问情况：
+
+
+
+ Cx0
+
+
+
+
+ Cx1
+
+
+
+
+ Cx2
+
+
+
+
+ Cx3
+
+
- The parameter will not change if you leave it empty.
- 如果留空，则对应参数将保持不变
+
+ Data Block Permission:
+ 数据Block访问权限：
+
+
+
+ Block0
+
+
+
+
+ Block1
+
+
+
+
+ Block2
+
+
+
+
+
+ Read
+ 读
+
+
+
+
+ Write
+ 写
+
+
+
+ Increase
+ 增加
+
+
+
+ Decrease/Transfer/Restore
+ 减少/从缓冲区写入/读入至缓冲区
+
+
+
+ Trailer Block Permission:
+ Trailer访问权限：
+
+
+
+ KeyA
+
+
+
+
+ Access Bits
+ Access Bits
+
+
+
+ KeyB
+
+
+
+
+ Reference:
+MF1S70YYX_V1 Product data sheet
+Rev. 3.2 — 23 November 2017
+ 参考资料：
+MF1S70YYX_V1 Product data sheet
+Rev. 3.2 — 23 November 2017
+
+
+
+ Note:the Access Bits usually contains 4 bytes(8 hex symbols), but only the first 3 bytes matters. You can set the 4th byte randomly.
+ 注意：Access Bits一般包含4个字节（8个16进制字符），但只有前3个字节决定访问情况，最后一个字节可任意设置。
+
+
+
+ Invalid!
+It could make the whole sector blocked irreversibly!
+ 无效！
+可能导致整个扇区被不可逆转地锁定！
+
+
+
+ Valid
+ 有效
@@ -175,285 +294,303 @@
路径：
-
+
Refresh
刷新端口
-
+
Connect
连接
-
+
Disconnect
断开
-
+
Mifare
Mifare(IC)卡
-
- >>
-
-
-
-
- <<
-
-
-
-
- F
-
-
-
-
+
Card Type
卡类型
-
+
MINI
+ 320
-
+
1K
+ 1024
-
+
2K
+ 2048
-
+
4K
+ 4096
-
+
File
文件
-
-
+
+
Load
加载
-
-
+
+
Save
保存
-
-
+
+
Data
-
+
Key
-
+
Attack
破解
-
+
Card Info
读卡片信息
-
+
Check Default
验证默认密码
-
+
Nested
Nested攻击
-
+
Hardnested
Hardested攻击
-
+
Read/Write
读/写
-
+
Block:
-
+
Key:
-
+
Key Type:
Key类型：
-
- A
-
+
+ Snoop
+ 嗅探(Snoop)
-
- B
-
+
+ List Data
+ 列出嗅探数据
-
+
Data:
-
+
Normal(Require Password)
普通卡（需要密码）
-
-
- Read Block
- 读单个块
-
-
-
-
- Write Block
- 写单个块
-
-
-
-
-
+
Read All
读所有块
-
-
- Write All
- 写所有块
-
-
-
+
Dump
Dump命令
-
+
Restore
Restore命令
-
+
Chinese Magic Card(Without Password)
UID卡（不需要密码）
-
+
Lock UFUID Card
锁定UFUID卡
-
-
+
+
About UID Card
关于UID卡
-
+
Set Parameter
设置卡参数
-
+
Wipe
擦除
-
-
+
+
Simulate
模拟
-
+
Load from data above
从上方数据导入
-
-
+
+
Clear
清空
-
-
- Sniff
- 嗅探
+
+ Select All
+ 全选
-
- List Sniff Data
- 列出嗅探数据
+
+ KeyBlocks->Key
+ 密码区->密码
+
+
+
+ KeyBlocks<-Key
+ 密码区<-密码
+
+
+
+ Fill Keys
+ 填充密码
+
+
+
+ Trailer Decoder
+ Trailer解码
+
+
+
+ Set Fonts
+ 设置字体
+
+
+
+
+ Read One
+ 读取单个区
+
+
+
+
+ Write One
+ 写入单个区
+
+
+
+
+ Read Selected
+ 读取选中块
-
+
+
+ Write Selected
+ 写入选中块
+
+
+
+
+ Sniff
+ 嗅探
+
+
+
RawCommand
原始命令
-
-
+
+
History:
命令历史：
-
+
ClearHistory
清空历史
-
+
Send
发送
-
+
ClearOutput
清空输出
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Info
信息
@@ -463,267 +600,246 @@
请先选择端口
-
+
Connected
已连接
-
-
-
+
+
+
Not Connected
未连接
- When Changeing card type, the data and keys in this app will be cleard.
-Continue?
- 更改卡容量后，窗口中的data和key会被清空\n要继续吗？
-
-
- Plz choose the data file:
- 请选择data文件：
-
-
-
+
Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml);;All Files(*.*)
二进制Data文件(*.bin *.dump);;文本Data文件(*.txt *.eml);;所有文件(*.*)
-
-
-
+
+
+
Failed to open
无法打开
- Plz choose the key file:
- 请选择key文件：
-
-
- Binary Key Files(*.bin *.dump);;All Files(*.*)
- 二进制Key文件(*.bin *.dump);;所有文件(*.*)
-
-
- Save data to
- 保存数据至
-
-
-
- When Changeing card type, the data and keys in this app will be cleard.
- 卡片容量改变后，上方的所有Data和Key会被清空。
-
-
-
+
Continue?
确定？
-
+
+ Some of the data and key will be cleared.
+ 部分数据和密码将被清除
+
+
+
Plz select the font of data widget and key widget
请选择Data窗口和Key窗口的字体
-
+
Data must consists of 32 Hex symbols(Whitespace is allowed)
Data必须由32个十六进制字符组成（中间可含有空格）
-
-
+
+
Key must consists of 12 Hex symbols(Whitespace is allowed)
Key必须由12个十六进制字符组成（中间可含有空格）
-
+
Plz select the data file:
请选择data文件：
-
+
Plz select the key file:
请选择key文件：
-
+
Binary Key Files(*.bin *.dump);;Binary Data Files(*.bin *.dump);;All Files(*.*)
二进制Key文件(*.bin *.dump)二进制Data文件(*.bin *.dump);;所有文件(*.*)
-
+
Plz select the location to save data file:
请选择文件保存的位置：
-
+
Binary Data Files(*.bin *.dump);;Text Data Files(*.txt *.eml)
二进制Data文件(*.bin *.dump);;文本Data文件(*.txt *.eml)
-
-
-
+
+
+
Failed to save to
无法保存至
-
+
Plz select the location to save key file:
请选择key文件保存的位置：
-
+
Binary Key Files(*.bin *.dump)
二进制Key文件(*.bin *.dump)
-
+
Normally, the Block 0 of a typical Mifare card, which contains the UID, is locked during the manufacture. Users cannot write anything to Block 0 or set a new UID to a normal Mifare card.
普通Mifare卡的Block0无法写入，UID也不能更改
-
+
Chinese Magic Cards(aka UID Cards) are some special cards whose Block 0 are writeable. And you can change UID by writing to it.
UID卡（在国外叫Chinese Magic Card）的Block0可写，UID可变
-
+
There are two versions of Chinese Magic Cards, the Gen1 and the Gen2.
国外把UID卡分为Chinese Magic Card Gen1和Gen2
-
+
Gen1:
-
+
also called UID card in China. It responses to some backdoor commands so you can access any blocks without password. The Proxmark3 has a bunch of related commands(csetblk, cgetblk, ...) to deal with this type of card, and my GUI also support these commands.
指通常所说的UID卡，可以通过后门指令直接读写块而无需密码，在PM3和此GUI中有特殊命令处理这类卡片
-
+
Gen2:
-
+
doesn't response to the backdoor commands, which means that a reader cannot detect whether it is a Chinese Magic Card or not by sending backdoor commands.
这个叫法在国内比较罕见，在国外指CUID/FUID/UFUID这类对后门指令不响应的卡（防火墙卡）
-
+
There are some types of Chinese Magic Card Gen2.
以下是Gen2卡的详细介绍
-
+
CUID Card:
CUID卡：
-
+
the Block 0 is writeable, you can write to this block repeatedly by normal wrbl command.
可通过普通的写块命令来写Block0，可重复擦写
-
+
(hf mf wrbl 0 A FFFFFFFFFFFF <the data you want to write>)
(hf mf wrbl 0 A FFFFFFFFFFFF <待写入数据>)
-
+
FUID Card:
FUID卡：
-
+
you can only write to Block 0 once. After that, it seems like a typical Mifare card(Block 0 cannot be written to).
Block0只能写入一次
-
+
(some readers might try changing the Block 0, which could detect the CUID Card. In that case, you should use FUID card.)
(更高级的穿防火墙卡，可以过一些能识别出CUID卡的读卡器)
-
+
UFUID Card:
UFUID卡：
-
+
It behaves like a CUID card(or UID card? I'm not sure) before you send some special command to lock it. Once it is locked, you cannot change its Block 0(just like a typical Mifare card).
锁卡前和普通UID/CUID卡一样可以反复读写Block0，用特殊命令锁卡后就和FUID卡一样了
-
+
Seemingly, these Chinese Magic Cards are more easily to be compromised by Nested Attack(it takes little time to get an unknown key).
所有UID卡都似乎更容易被Nested攻击破解
-
+
Plz select the trace file:
请选择trace文件：
-
+
Trace Files(*.trc);;All Files(*.*)
Trace文件(*.trc);;所有文件(*.*)
-
+
Plz select the location to save trace file:
请选择trace文件保存的位置：
-
+
Trace Files(*.trc)
Trace文件(*.trc)
-
-
+
+
Idle
空闲
-
-
+
+
Sec
-
+
Blk
-
+
KeyA
-
+
KeyB
-
+
HW Version:
固件版本：
-
+
PM3:
连接状态：
-
+
State:
运行状态：
-
+
Running
运行中
@@ -731,32 +847,35 @@ Continue?
Mifare
- info
- 信息：
-
-
-
-
+
+
Success!
成功！
-
-
-
-
-
+
+
+
+
+
+
Info
信息
-
-
+
+ Plz provide at least one known key
+ 请至少提供一个已知密码
+
+
+
+
+
Failed!
失败！
-
+
Failed to read card.
读卡失败。
diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
index 29270d9..c3c7cb0 100644
--- a/ui/mainwindow.cpp
+++ b/ui/mainwindow.cpp
@@ -930,10 +930,3 @@ void MainWindow::saveClientPath(const QString& path)
settings->endGroup();
}
// ***********************************************
-
-
-
-void MainWindow::on_testButton_clicked()
-{
-// mifare->_readsec(0, Mifare::KEY_A, "FFFFFFFFFFFF");
-}
diff --git a/ui/mainwindow.h b/ui/mainwindow.h
index 2b4fec0..d5622bd 100644
--- a/ui/mainwindow.h
+++ b/ui/mainwindow.h
@@ -144,8 +144,6 @@ private slots:
void on_MF_Sniff_snoopButton_clicked();
- void on_testButton_clicked();
-
void on_MF_trailerDecoderButton_clicked();
private:
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index ba2bf94..e0ca29f 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -578,13 +578,6 @@
- -
-
-
- test
-
-
-
-