Skip to content

Commit ba26fd2

Browse files
lzy98276lzy98276
authored
Merge pull request #107 from SECTL/fix-history
修复 issue #71
2 parents 075f2e1 + f1a23ba commit ba26fd2

20 files changed

Lines changed: 3050 additions & 862 deletions

‎app/Language/modules/basic_settings.py‎

Lines changed: 62 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@
165165
"name": "Start on boot",
166166
"description": "Set whether the software is running automatically with the system",
167167
},
168-
"show_startup_window": {
169-
"name": "Show main window on startup",
170-
"description": "Set whether to automatically display the main window when the software starts",
171-
},
172168
"check_update": {
173169
"name": "Check for updates on startup",
174-
"description": "Set whether new versions will be checked automatically on boot",
170+
"description": "Set whether to automatically check for new versions when software starts",
171+
},
172+
"show_startup_window": {
173+
"name": "Show splash screen",
174+
"description": "Set whether to show the splash screen on boot",
175175
},
176176
"export_diagnostic_data": {
177177
"name": "Export diagnostic data",
@@ -190,16 +190,16 @@
190190
},
191191
"export_all_data": {
192192
"name": "Export all data",
193-
"description": "Export all data and settings on exit",
193+
"description": "Export all data and settings when exit",
194194
"pushbutton_name": "Export all data",
195195
},
196196
"import_all_data": {
197197
"name": "Import all data",
198-
"description": "Restore all data from backup file on boot",
198+
"description": "Restore all data from backup file when software starts",
199199
"pushbutton_name": "Import all data",
200200
},
201201
"dpiScale": {
202-
"name": "DPI Scale",
202+
"name": "DPI scale settings",
203203
"description": "Resize the app interface (restart required)",
204204
"combo_items": {
205205
"0": "100%",
@@ -216,27 +216,23 @@
216216
},
217217
"theme": {
218218
"name": "Theme mode",
219-
"description": "Select the theme for the software interface",
220-
"combo_items": {
221-
"0": "Light",
222-
"1": "Dark",
223-
"2": "Follow system",
224-
},
219+
"description": "Select the software interface theme style",
220+
"combo_items": {"0": "Light", "1": "Dark", "2": "Follow system"},
225221
},
226222
"theme_color": {
227223
"name": "Theme color",
228-
"description": "Set the theme color of the software",
224+
"description": "Set the software interface theme color",
229225
},
230226
"language": {
231227
"name": "Display language",
232-
"description": "Switch the software interface language (restart required)",
228+
"description": "Switch display language (restart required)",
233229
},
234230
"background_resident": {
235-
"name": "Parish in backend",
231+
"name": "Run in background",
236232
"description": "Whether to remain in the back office after closing all windows",
237233
},
238234
"url_protocol": {
239-
"name": "URL Protocol Registration",
235+
"name": "URL protocol register",
240236
"description": "Sign up for custom URL protocol (secrandom://), support to launch app via link",
241237
},
242238
"log_level": {
@@ -251,140 +247,82 @@
251247
},
252248
},
253249
"settings_import_export": {
254-
"export_success_title": {
255-
"name": "Export settings",
256-
},
250+
"export_success_title": {"name": "Export settings"},
257251
"export_success_content": {
258-
"name": "设置已成功导出到:\n{path}",
259-
},
260-
"export_failure_title": {
261-
"name": "Export settings",
262-
},
263-
"export_failure_content": {
264-
"name": "导出设置失败:\n{error}",
265-
},
266-
"import_confirm_title": {
267-
"name": "Import settings",
252+
"name": "Settings have been exported to:\n{path}"
268253
},
254+
"export_failure_title": {"name": "Export settings"},
255+
"export_failure_content": {"name": "Failed to export settings: \n{error}"},
256+
"import_confirm_title": {"name": "Import settings"},
269257
"import_confirm_content": {
270-
"name": "Are you sure you want to import these settings? This will overwrite the current settings",
271-
},
272-
"import_confirm_button": {
273-
"name": "Confirm import",
274-
},
275-
"import_cancel_button": {
276-
"name": "Cancel import",
277-
},
278-
"import_success_title": {
279-
"name": "Import settings",
258+
"name": "Are you sure you want to import these settings? This will overwrite the current settings"
280259
},
260+
"import_confirm_button": {"name": "Confirm import"},
261+
"import_cancel_button": {"name": "Cancel import"},
262+
"import_success_title": {"name": "Import settings"},
281263
"import_success_content": {
282-
"name": "Settings successfully imported\napplication restarted for changes to take effect",
283-
},
284-
"import_success_button": {
285-
"name": "I know",
286-
},
287-
"export_success_button": {
288-
"name": "I know",
264+
"name": "Settings successfully imported\nRestart to take effect"
289265
},
290-
"import_failure_title": {
291-
"name": "Import settings",
292-
},
293-
"import_failure_content": {
294-
"name": "导入设置失败:\n{error}",
295-
},
296-
},
297-
"show_startup_window_notification": {
298-
"success_enable_content": {"name": "Startup main window display enabled"},
299-
"info_disable_content": {"name": "Startup main window display disabled"},
266+
"import_success_button": {"name": "Got it"},
267+
"export_success_button": {"name": "Got it"},
268+
"import_failure_title": {"name": "Import settings"},
269+
"import_failure_content": {"name": "Failed to import settings: \n{error}"},
300270
},
301271
"data_import_export": {
302-
"export_success_title": {
303-
"name": "Export all data",
304-
},
272+
"export_success_title": {"name": "Export all data"},
305273
"export_success_content": {
306-
"name": "所有数据已成功导出到:\n{path}",
307-
},
308-
"export_failure_title": {
309-
"name": "Export all data",
310-
},
311-
"export_failure_content": {
312-
"name": "导出所有数据失败:\n{error}",
313-
},
314-
"import_confirm_title": {
315-
"name": "Import all data",
274+
"name": "All data has been exported to:\n{path}"
316275
},
276+
"export_failure_title": {"name": "Export all data"},
277+
"export_failure_content": {"name": "Failed to export all data: \n{error}"},
278+
"import_confirm_title": {"name": "Import all data"},
317279
"import_confirm_content": {
318-
"name": "Are you sure you want to import these data? This will overwrite the current data",
319-
},
320-
"import_confirm_button": {
321-
"name": "Confirm import",
322-
},
323-
"import_cancel_button": {
324-
"name": "Cancel import",
325-
},
326-
"import_success_title": {
327-
"name": "Import all data",
280+
"name": "Are you sure you want to import these data? This will overwrite the current data"
328281
},
282+
"import_confirm_button": {"name": "Confirm import"},
283+
"import_cancel_button": {"name": "Cancel import"},
284+
"import_success_title": {"name": "Import all data"},
329285
"import_success_content": {
330-
"name": "Data imported successfully into\napplication restarted for changes to take effect",
331-
},
332-
"import_success_button": {
333-
"name": "I know",
334-
},
335-
"import_failure_title": {
336-
"name": "Import all data",
337-
},
338-
"import_failure_content": {
339-
"name": "导入所有数据失败:\n{error}",
340-
},
341-
"existing_files_count": {
342-
"name": "\n... 还有 {len} 个文件",
343-
},
344-
"existing_files_title": {
345-
"name": "File already exists",
286+
"name": "Data imported successfully into\nRestart APP to take effect"
346287
},
288+
"import_success_button": {"name": "Got it"},
289+
"import_failure_title": {"name": "Import all data"},
290+
"import_failure_content": {"name": "Failed to import all data: \n{error}"},
291+
"existing_files_count": {"name": "\n... still have {len} files"},
292+
"existing_files_title": {"name": "File already exists"},
347293
"existing_files_content": {
348-
"name": "以下文件已存在:\n{files}\n\n是否覆盖这些文件？",
349-
},
350-
"version_mismatch_title": {
351-
"name": "Version mismatch",
294+
"name": "The following files already exist:\n{files}\n\nOverwrite these files?"
352295
},
296+
"version_mismatch_title": {"name": "Version mismatch"},
353297
"version_mismatch_content": {
354-
"name": "导出数据的软件版本与当前版本不一致:\n\n导出数据的软件: {software_name} {version}\n当前软件: SecRandom {current_version}\n\n是否继续导入？",
355-
},
356-
"export_warning_title": {
357-
"name": "Export all data",
298+
"name": "The version from imported data mismatches with current version:\n\nImported data is from: {software_name} {version}\nCurrent software is: SecRandom {current_version}\n\nContinue importing?"
358299
},
300+
"export_warning_title": {"name": "Export all data"},
359301
"export_warning_content": {
360-
"name": "即将导出所有数据，包括:\n\n软件版本、设置配置\n点名名单、抽奖名单\n历史记录、日志文件\n\n注意: 导出的数据可能包含敏感信息，请妥善保管。\n\n是否继续导出?",
302+
"name": "All data will soon be exported, including:\n\nsoftware version, settings,\nname list, prize list,\nhistory, log file\n\nNOTE: exported data may contain sensitive information, please keep it safe.\n\nContinue exporting?"
361303
},
362304
},
363305
"diagnostic_data_export": {
364-
"export_confirm_button": {
365-
"name": "Confirm Export",
366-
},
367-
"export_cancel_button": {
368-
"name": "Cancel Export",
369-
},
370-
"export_success_title": {
371-
"name": "Export diagnostic data",
372-
},
306+
"export_confirm_button": {"name": "Confirm Export"},
307+
"export_cancel_button": {"name": "Cancel export"},
308+
"export_success_title": {"name": "Export diagnostic data"},
373309
"export_success_content": {
374-
"name": "诊断数据已成功导出到:\n{path}",
375-
},
376-
"export_failure_title": {
377-
"name": "Export diagnostic data",
310+
"name": "Diagnostic data has been exported to:\n{path}"
378311
},
312+
"export_failure_title": {"name": "Export diagnostic data"},
379313
"export_failure_content": {
380-
"name": "导出诊断数据失败:\n{error}",
381-
},
382-
"export_warning_title": {
383-
"name": "Export diagnostic data",
314+
"name": "Failed to export diagnostic data: \n{error}"
384315
},
316+
"export_warning_title": {"name": "Export diagnostic data"},
385317
"export_warning_content": {
386-
"name": "即将导出诊断数据，包括:\n\n软件信息、设置配置\n点名名单、抽奖名单\n历史记录、日志文件\n\n注意: 导出的数据可能包含敏感信息，请妥善保管。\n\n是否继续导出?",
318+
"name": "Diagnostic data will soon be exported, including:\n\nsoftware information, settings,\nname list, prize list,\nhistory, log file\n\nNOTE: exported data may contain sensitive information, please keep it safe.\n\nContinue exporting?"
387319
},
388320
},
321+
"success_enable_content": {
322+
"name": "Enabled displaying main window when launching"
323+
},
324+
"info_disable_content": {
325+
"name": "Disabled displaying main window when launching"
326+
},
389327
},
390328
}

0 commit comments

Comments
 (0)