Skip to content

Commit 8b8f96a

Browse files
KangLinKangLin
committed
Plugins::WebBrowser: modify history database
1 parent ad98c5a commit 8b8f96a

12 files changed

Lines changed: 408 additions & 527 deletions

File tree

‎App/Client/Favorite/FavoriteDatabase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ bool CFavoriteDatabase::ImportFromJson(const QJsonObject &obj)
453453
{
454454
QJsonArray favorites = obj["favorite"].toArray();
455455
if(favorites.isEmpty()) {
456-
SetError(tr("The file format is error. Json without favorite"));
456+
SetError(tr("The file format is error. Json without \"favorite\""));
457457
qCritical(log) << GetError();
458458
return false;
459459
}

‎App/Client/Recent/RecentDatabase.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ bool CRecentDatabase::ImportFromJson(const QJsonObject &obj)
368368
{
369369
QJsonArray recents = obj["Recent"].toArray();
370370
if(recents.isEmpty()){
371-
SetError(tr("The file format is error. Don't find recents"));
371+
SetError(tr("The file format is error. Don't find \"recents\""));
372372
qCritical(log) << GetError();
373373
return false;
374374
}

‎App/Client/Resource/Translations/RabbitRemoteControlApp_zh_CN.ts‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,173 +5,173 @@
55
<name>CFavoriteDatabase</name>
66
<message>
77
<location filename="../../Favorite/FavoriteDatabase.cpp" line="456"/>
8-
<source>The file format is error. Json without favorite</source>
9-
<translation>文件格式错误。未发现 favorite</translation>
8+
<source>The file format is error. Json without &quot;favorite&quot;</source>
9+
<translation>文件格式错误。未发现 &quot;favorite&quot;</translation>
1010
</message>
1111
</context>
1212
<context>
1313
<name>CFavoriteView</name>
1414
<message>
15-
<location filename="../../Favorite/FavoriteView.cpp" line="129"/>
16-
<location filename="../../Favorite/FavoriteView.cpp" line="432"/>
15+
<location filename="../../Favorite/FavoriteView.cpp" line="130"/>
16+
<location filename="../../Favorite/FavoriteView.cpp" line="433"/>
1717
<source>New group</source>
1818
<translation>新建组</translation>
1919
</message>
2020
<message>
21-
<location filename="../../Favorite/FavoriteView.cpp" line="49"/>
21+
<location filename="../../Favorite/FavoriteView.cpp" line="50"/>
2222
<source>Favorite</source>
2323
<translation>收藏夹</translation>
2424
</message>
2525
<message>
26-
<location filename="../../Favorite/FavoriteView.cpp" line="53"/>
27-
<location filename="../../Favorite/FavoriteView.cpp" line="58"/>
26+
<location filename="../../Favorite/FavoriteView.cpp" line="54"/>
27+
<location filename="../../Favorite/FavoriteView.cpp" line="59"/>
2828
<source>Tools</source>
2929
<translation>工具</translation>
3030
</message>
3131
<message>
32-
<location filename="../../Favorite/FavoriteView.cpp" line="93"/>
32+
<location filename="../../Favorite/FavoriteView.cpp" line="94"/>
3333
<source>Show tool bar</source>
3434
<translation>显示工具条</translation>
3535
</message>
3636
<message>
37-
<location filename="../../Favorite/FavoriteView.cpp" line="107"/>
37+
<location filename="../../Favorite/FavoriteView.cpp" line="108"/>
3838
<source>Start</source>
3939
<translation>开始</translation>
4040
</message>
4141
<message>
42-
<location filename="../../Favorite/FavoriteView.cpp" line="117"/>
42+
<location filename="../../Favorite/FavoriteView.cpp" line="118"/>
4343
<source>Open settings and Start</source>
4444
<translation>打开设置并开始</translation>
4545
</message>
4646
<message>
47-
<location filename="../../Favorite/FavoriteView.cpp" line="138"/>
48-
<location filename="../../Favorite/FavoriteView.cpp" line="402"/>
47+
<location filename="../../Favorite/FavoriteView.cpp" line="139"/>
48+
<location filename="../../Favorite/FavoriteView.cpp" line="403"/>
4949
<source>Edit</source>
5050
<translation>编辑</translation>
5151
</message>
5252
<message>
53-
<location filename="../../Favorite/FavoriteView.cpp" line="147"/>
54-
<location filename="../../Favorite/FavoriteView.cpp" line="418"/>
53+
<location filename="../../Favorite/FavoriteView.cpp" line="148"/>
54+
<location filename="../../Favorite/FavoriteView.cpp" line="419"/>
5555
<source>Delete</source>
5656
<translation>删除</translation>
5757
</message>
5858
<message>
59-
<location filename="../../Favorite/FavoriteView.cpp" line="157"/>
59+
<location filename="../../Favorite/FavoriteView.cpp" line="158"/>
6060
<source>Import</source>
6161
<translation>导入</translation>
6262
</message>
6363
<message>
64-
<location filename="../../Favorite/FavoriteView.cpp" line="165"/>
64+
<location filename="../../Favorite/FavoriteView.cpp" line="166"/>
6565
<source>Export</source>
6666
<translation>导出</translation>
6767
</message>
6868
<message>
69-
<location filename="../../Favorite/FavoriteView.cpp" line="174"/>
69+
<location filename="../../Favorite/FavoriteView.cpp" line="175"/>
7070
<source>Refresh</source>
7171
<translation>刷新</translation>
7272
</message>
7373
<message>
74-
<location filename="../../Favorite/FavoriteView.cpp" line="273"/>
74+
<location filename="../../Favorite/FavoriteView.cpp" line="274"/>
7575
<source>Root</source>
7676
<translation>根</translation>
7777
</message>
7878
<message>
79-
<location filename="../../Favorite/FavoriteView.cpp" line="294"/>
80-
<location filename="../../Favorite/FavoriteView.cpp" line="299"/>
79+
<location filename="../../Favorite/FavoriteView.cpp" line="295"/>
80+
<location filename="../../Favorite/FavoriteView.cpp" line="300"/>
8181
<source>Add favorite</source>
8282
<translation>增加收藏</translation>
8383
</message>
8484
<message>
85-
<location filename="../../Favorite/FavoriteView.cpp" line="295"/>
85+
<location filename="../../Favorite/FavoriteView.cpp" line="296"/>
8686
<source>&quot;%1&quot; already exists in &quot;%2&quot;</source>
8787
<translation>&quot;%1&quot; 已收藏于 &quot;%2&quot; 之中</translation>
8888
</message>
8989
<message>
90-
<location filename="../../Favorite/FavoriteView.cpp" line="300"/>
90+
<location filename="../../Favorite/FavoriteView.cpp" line="301"/>
9191
<source>&quot;%1&quot; already exists, do you want to move it to &quot;%2&quot;?</source>
9292
<translation>&quot;%1&quot; 已收藏，确定想移到 &quot;%2&quot;?</translation>
9393
</message>
9494
<message>
95-
<location filename="../../Favorite/FavoriteView.cpp" line="468"/>
96-
<location filename="../../Favorite/FavoriteView.cpp" line="496"/>
97-
<location filename="../../Favorite/FavoriteView.cpp" line="574"/>
95+
<location filename="../../Favorite/FavoriteView.cpp" line="469"/>
96+
<location filename="../../Favorite/FavoriteView.cpp" line="497"/>
97+
<location filename="../../Favorite/FavoriteView.cpp" line="575"/>
9898
<source>Success</source>
9999
<translation>成功</translation>
100100
</message>
101101
<message>
102-
<location filename="../../Favorite/FavoriteView.cpp" line="469"/>
103-
<location filename="../../Favorite/FavoriteView.cpp" line="574"/>
102+
<location filename="../../Favorite/FavoriteView.cpp" line="470"/>
103+
<location filename="../../Favorite/FavoriteView.cpp" line="575"/>
104104
<source>Successfully imported favorite from JSON file: %1</source>
105105
<translation>成功从 JSON 文件导入收藏：%1</translation>
106106
</message>
107107
<message>
108-
<location filename="../../Favorite/FavoriteView.cpp" line="471"/>
109-
<location filename="../../Favorite/FavoriteView.cpp" line="499"/>
110-
<location filename="../../Favorite/FavoriteView.cpp" line="576"/>
108+
<location filename="../../Favorite/FavoriteView.cpp" line="472"/>
109+
<location filename="../../Favorite/FavoriteView.cpp" line="500"/>
110+
<location filename="../../Favorite/FavoriteView.cpp" line="577"/>
111111
<source>Failed to import favorite from JSON file: %1</source>
112112
<translation>从 JSON 文件导入收藏失败：%1</translation>
113113
</message>
114114
<message>
115-
<location filename="../../Favorite/FavoriteView.cpp" line="473"/>
116-
<location filename="../../Favorite/FavoriteView.cpp" line="501"/>
117-
<location filename="../../Favorite/FavoriteView.cpp" line="578"/>
115+
<location filename="../../Favorite/FavoriteView.cpp" line="474"/>
116+
<location filename="../../Favorite/FavoriteView.cpp" line="502"/>
117+
<location filename="../../Favorite/FavoriteView.cpp" line="579"/>
118118
<source>Error: </source>
119119
<translation>错误：</translation>
120120
</message>
121121
<message>
122-
<location filename="../../Favorite/FavoriteView.cpp" line="474"/>
123-
<location filename="../../Favorite/FavoriteView.cpp" line="502"/>
124-
<location filename="../../Favorite/FavoriteView.cpp" line="506"/>
125-
<location filename="../../Favorite/FavoriteView.cpp" line="579"/>
122+
<location filename="../../Favorite/FavoriteView.cpp" line="475"/>
123+
<location filename="../../Favorite/FavoriteView.cpp" line="503"/>
124+
<location filename="../../Favorite/FavoriteView.cpp" line="507"/>
125+
<location filename="../../Favorite/FavoriteView.cpp" line="580"/>
126126
<source>Failure</source>
127127
<translation>失败</translation>
128128
</message>
129129
<message>
130-
<location filename="../../Favorite/FavoriteView.cpp" line="479"/>
131-
<location filename="../../Favorite/FavoriteView.cpp" line="507"/>
130+
<location filename="../../Favorite/FavoriteView.cpp" line="480"/>
131+
<location filename="../../Favorite/FavoriteView.cpp" line="508"/>
132132
<source>Invalid file: %1</source>
133133
<translation>无效文件：%1</translation>
134134
</message>
135135
<message>
136-
<location filename="../../Favorite/FavoriteView.cpp" line="480"/>
137-
<location filename="../../Favorite/FavoriteView.cpp" line="508"/>
136+
<location filename="../../Favorite/FavoriteView.cpp" line="481"/>
137+
<location filename="../../Favorite/FavoriteView.cpp" line="509"/>
138138
<source>Please use JSON file</source>
139139
<translation>请使用 JSON 文件</translation>
140140
</message>
141141
<message>
142-
<location filename="../../Favorite/FavoriteView.cpp" line="497"/>
142+
<location filename="../../Favorite/FavoriteView.cpp" line="498"/>
143143
<source>Favorite successfully exported to JSON file: %1</source>
144144
<translation>成功导出收藏到 JSON 文件：%1</translation>
145145
</message>
146146
<message>
147-
<location filename="../../Favorite/FavoriteView.cpp" line="402"/>
147+
<location filename="../../Favorite/FavoriteView.cpp" line="403"/>
148148
<source>Enter the modified name</source>
149149
<translation>输入修改后的名称</translation>
150150
</message>
151151
<message>
152-
<location filename="../../Favorite/FavoriteView.cpp" line="418"/>
152+
<location filename="../../Favorite/FavoriteView.cpp" line="419"/>
153153
<source>Will be delete &quot;%1&quot;</source>
154154
<translation>&quot;%1&quot; 将被删除</translation>
155155
</message>
156156
<message>
157-
<location filename="../../Favorite/FavoriteView.cpp" line="458"/>
158-
<location filename="../../Favorite/FavoriteView.cpp" line="478"/>
157+
<location filename="../../Favorite/FavoriteView.cpp" line="459"/>
158+
<location filename="../../Favorite/FavoriteView.cpp" line="479"/>
159159
<source>Import favorite</source>
160160
<translation>导入收藏</translation>
161161
</message>
162162
<message>
163-
<location filename="../../Favorite/FavoriteView.cpp" line="460"/>
164-
<location filename="../../Favorite/FavoriteView.cpp" line="489"/>
163+
<location filename="../../Favorite/FavoriteView.cpp" line="461"/>
164+
<location filename="../../Favorite/FavoriteView.cpp" line="490"/>
165165
<source>JSON (*.json)</source>
166166
<translation></translation>
167167
</message>
168168
<message>
169-
<location filename="../../Favorite/FavoriteView.cpp" line="487"/>
169+
<location filename="../../Favorite/FavoriteView.cpp" line="488"/>
170170
<source>Export favorite</source>
171171
<translation>导出收藏</translation>
172172
</message>
173173
<message>
174-
<location filename="../../Favorite/FavoriteView.cpp" line="432"/>
174+
<location filename="../../Favorite/FavoriteView.cpp" line="433"/>
175175
<source>Input group name</source>
176176
<translation>输入组名</translation>
177177
</message>
@@ -564,8 +564,8 @@ File: %1</source>
564564
<name>CRecentDatabase</name>
565565
<message>
566566
<location filename="../../Recent/RecentDatabase.cpp" line="371"/>
567-
<source>The file format is error. Don&apos;t find recents</source>
568-
<translation>文件格式错误。未发现 recents </translation>
567+
<source>The file format is error. Don&apos;t find &quot;recents&quot;</source>
568+
<translation>文件格式错误。未发现 &quot;recents&quot;</translation>
569569
</message>
570570
</context>
571571
<context>

0 commit comments

Comments
 (0)