diff --git a/translation/pofiles/vi.po b/translation/pofiles/vi.po
index 734906c88e..d732f26587 100644
--- a/translation/pofiles/vi.po
+++ b/translation/pofiles/vi.po
@@ -312,6 +312,10 @@ msgid ""
"Successive Tabs while holding %s down will cycle through viewports in the "
"popup."
msgstr ""
+"Lưu và khôi phục hướng xem và thu phóng.\n"
+"Sử dụng %s+Tab để kích hoạt bộ chọn.\n"
+"Các Tab liên tiếp trong khi nhấn giữ %s sẽ chuyển qua các khung nhìn trong "
+"cửa sổ bật lên."
#: 3d-viewer/3d_viewer/3d_toolbar.cpp:83
msgid "Reload board"
@@ -385,7 +389,8 @@ msgstr ""
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:176
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:188
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:200
-#: pcbnew/pcb_marker.cpp:205
+#: pcbnew/pcb_marker.cpp:205 eeschema/files-io.cpp:842
+#: eeschema/files-io.cpp:914
msgid "Error"
msgstr "Lỗi"
@@ -1327,12 +1332,14 @@ msgstr "Bộ chuyển đổi Bitmap thành linh kiện"
#: bitmap2component/bitmap2cmp_gui.cpp:374
#: eeschema/tools/sch_drawing_tools.cpp:572
#: pagelayout_editor/pl_editor_frame.cpp:842 pcbnew/tools/drawing_tool.cpp:665
+#: eeschema/tools/sch_drawing_tools.cpp:570
msgid "Choose Image"
msgstr "Chọn Ảnh"
#: bitmap2component/bitmap2cmp_gui.cpp:375
#: eeschema/tools/sch_drawing_tools.cpp:573
#: pagelayout_editor/pl_editor_frame.cpp:843 pcbnew/tools/drawing_tool.cpp:666
+#: eeschema/tools/sch_drawing_tools.cpp:571
msgid "Image Files"
msgstr "Các file Ảnh"
@@ -1557,7 +1564,7 @@ msgstr "Xuất ra Bộ nhớ tạm"
#: bitmap2component/bitmap2cmp_gui_base.h:96
#: kicad/tools/kicad_manager_actions.cpp:110
msgid "Image Converter"
-msgstr ""
+msgstr "Chuyển đổi hình ảnh"
#: common/common.cpp:227
#, c-format
@@ -1667,6 +1674,7 @@ msgstr "Nếu bạn không lưu, tất cả các thay đổi của bạn sẽ b
#: eeschema/symbol_editor/symbol_editor.cpp:550
#: eeschema/widgets/tuner_slider_base.cpp:75
#: pcbnew/footprint_libraries_utils.cpp:1059
+#: eeschema/widgets/tuner_slider_base.cpp:66
msgid "Save"
msgstr "Lưu lại"
@@ -1723,7 +1731,7 @@ msgstr "Xác nhận"
#: pcbnew/tools/drawing_stackup_table_tool.cpp:495
#: pcbnew/tools/drawing_stackup_table_tool.cpp:506
msgid "Yes"
-msgstr ""
+msgstr "Đồng ý"
#: common/confirm.cpp:395 eeschema/lib_field.cpp:534 eeschema/lib_pin.cpp:1150
#: eeschema/sch_field.cpp:766 eeschema/sch_pin.cpp:222
@@ -1735,7 +1743,7 @@ msgstr ""
#: pcbnew/tools/drawing_stackup_table_tool.cpp:495
#: pcbnew/tools/drawing_stackup_table_tool.cpp:505
msgid "No"
-msgstr ""
+msgstr "Không."
#: common/dialog_about/AboutDialog_main.cpp:115
#: common/widgets/widget_hotkey_list.cpp:474 eeschema/sch_symbol.cpp:1627
@@ -1964,6 +1972,7 @@ msgid "Report"
msgstr "Báo cáo"
#: common/dialogs/dialog_assign_netclass.cpp:104
+#: common/dialogs/dialog_assign_netclass.cpp:92
#, fuzzy
msgid "Currently matching nets:"
msgstr " Các Net hiện đang khớp:"
@@ -2122,7 +2131,7 @@ msgstr "Biến môi trường"
#: pcbnew/dialogs/dialog_net_inspector.cpp:964
#: pcbnew/dialogs/panel_fp_lib_table.cpp:460
#: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:38 pcbnew/zone.cpp:589
-#: pcbnew/zone.cpp:1414
+#: pcbnew/zone.cpp:1414 eeschema/widgets/tuner_slider_base.cpp:20
msgid "Name"
msgstr "Tên"
@@ -3028,12 +3037,12 @@ msgstr "Các Đường dẫn có sẵn:"
#: common/dialogs/eda_reorderable_list_dialog_base.cpp:40
msgid ">>"
-msgstr ""
+msgstr ">>"
#: common/dialogs/eda_reorderable_list_dialog_base.cpp:43
#: pcbnew/dialogs/dialog_imported_layers_base.cpp:71
msgid "<<"
-msgstr ""
+msgstr "<<"
#: common/dialogs/eda_reorderable_list_dialog_base.cpp:52
#, fuzzy
@@ -3249,7 +3258,7 @@ msgstr "Hiển thị các biểu tượng trong menu"
#: common/dialogs/panel_common_settings_base.cpp:125
msgid "This change takes effect when relaunching the editor."
-msgstr ""
+msgstr "Thay đổi này có hiệu lực khi khởi chạy lại trình chỉnh sửa."
#: common/dialogs/panel_common_settings_base.cpp:129
msgid "Focus follows mouse between schematic and PCB editors"
@@ -3984,7 +3993,7 @@ msgstr "Kiểu cách Đường thẳng"
#: eeschema/sch_textbox.cpp:449 include/stroke_params.h:80
#: pcbnew/fp_text.cpp:309 pcbnew/fp_textbox.cpp:315
#: pcbnew/pcb_dimension.cpp:329 pcbnew/pcb_text.cpp:142
-#: pcbnew/pcb_textbox.cpp:309
+#: pcbnew/pcb_textbox.cpp:309 eeschema/dialogs/dialog_sim_model.cpp:457
msgid "Default"
msgstr "Mặc định"
@@ -4319,7 +4328,7 @@ msgstr "Tên trường mẫu"
#: common/eda_base_frame.cpp:1065 common/tool/actions.cpp:610
#: kicad/tools/kicad_manager_actions.cpp:98 pcbnew/footprint_edit_frame.cpp:914
-#: pcbnew/menubar_footprint_editor.cpp:92
+#: pcbnew/menubar_footprint_editor.cpp:92 pcbnew/footprint_edit_frame.cpp:912
msgid "Footprint Editor"
msgstr "Trình chỉnh sửa Footprint"
@@ -4331,7 +4340,7 @@ msgstr "Giá trị mặc định"
#: common/eda_base_frame.cpp:1074 common/hotkey_store.cpp:74
#: kicad/tools/kicad_manager_actions.cpp:92 pcbnew/menubar_pcb_editor.cpp:185
#: pcbnew/pcb_edit_frame.cpp:182 pcbnew/pcb_edit_frame.cpp:1528
-#: pcbnew/tools/zone_filler_tool.cpp:272
+#: pcbnew/tools/zone_filler_tool.cpp:272 pcbnew/pcb_edit_frame.cpp:1539
#, fuzzy
msgid "PCB Editor"
msgstr "Trình chỉnh sửa Ảnh"
@@ -4557,12 +4566,13 @@ msgid "Zone"
msgstr "Zone"
#: common/eda_item.cpp:340 common/eda_item.cpp:341 pcbnew/pcb_track.cpp:822
+#: pcbnew/pcb_track.cpp:827
#, fuzzy
msgid "Track"
msgstr "Track"
#: common/eda_item.cpp:342 pcbnew/dialogs/dialog_board_statistics.cpp:501
-#: pcbnew/pcb_track.cpp:902
+#: pcbnew/pcb_track.cpp:902 pcbnew/pcb_track.cpp:899
#, fuzzy
msgid "Via"
msgstr "Via"
@@ -4757,7 +4767,7 @@ msgstr "Hình dạng"
#: common/eda_shape.cpp:637 common/eda_shape.cpp:644
#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:213
-#: pcbnew/pcb_track.cpp:842
+#: pcbnew/pcb_track.cpp:842 pcbnew/pcb_track.cpp:839
msgid "Radius"
msgstr "Bán kính"
@@ -4788,7 +4798,9 @@ msgstr "Điểm"
#: pcbnew/fp_text.cpp:311 pcbnew/fp_text_grid_table.cpp:102 pcbnew/pad.cpp:1002
#: pcbnew/pcb_bitmap.cpp:211 pcbnew/pcb_target.cpp:156
#: pcbnew/pcb_target.cpp:201 pcbnew/pcb_text.cpp:144 pcbnew/pcb_track.cpp:837
-#: pcbnew/pcb_track.cpp:1243 pcbnew/pcb_track.cpp:1273
+#: pcbnew/pcb_track.cpp:1243 pcbnew/pcb_track.cpp:1273 pcbnew/pcb_track.cpp:834
+#: pcbnew/pcb_track.cpp:1240 pcbnew/pcb_track.cpp:1261
+#: pcbnew/pcb_track.cpp:1291
#, fuzzy
msgid "Width"
msgstr "Chiều rộng"
@@ -4814,22 +4826,26 @@ msgid "Bezier"
msgstr "Bezier"
#: common/eda_shape.cpp:1693 pcbnew/pcb_textbox.cpp:529
-#: pcbnew/pcb_track.cpp:1246
+#: pcbnew/pcb_track.cpp:1246 pcbnew/pcb_track.cpp:1243
+#: pcbnew/pcb_track.cpp:1265
msgid "Start X"
msgstr "Bắt đầu X"
#: common/eda_shape.cpp:1696 pcbnew/pcb_textbox.cpp:530
-#: pcbnew/pcb_track.cpp:1250
+#: pcbnew/pcb_track.cpp:1250 pcbnew/pcb_track.cpp:1247
+#: pcbnew/pcb_track.cpp:1270
msgid "Start Y"
msgstr "Bắt đầu Y"
#: common/eda_shape.cpp:1699 pcbnew/pcb_textbox.cpp:531
-#: pcbnew/pcb_track.cpp:1253
+#: pcbnew/pcb_track.cpp:1253 pcbnew/pcb_track.cpp:1250
+#: pcbnew/pcb_track.cpp:1274
msgid "End X"
msgstr "Kết thúc X"
#: common/eda_shape.cpp:1702 pcbnew/pcb_textbox.cpp:532
-#: pcbnew/pcb_track.cpp:1256
+#: pcbnew/pcb_track.cpp:1256 pcbnew/pcb_track.cpp:1253
+#: pcbnew/pcb_track.cpp:1278
msgid "End Y"
msgstr "Kết thúc Y"
@@ -5268,7 +5284,7 @@ msgstr "Không thể sao chép tệp \"%s\"."
#: common/grid_tricks.cpp:325 common/tool/actions.cpp:153
#: eeschema/tools/ee_actions.cpp:157 pcbnew/dialogs/panel_setup_rules.cpp:111
-#: pcbnew/tools/edit_tool.cpp:1973
+#: pcbnew/tools/edit_tool.cpp:1973 pcbnew/tools/edit_tool.cpp:1971
msgid "Cut"
msgstr "Cắt"
@@ -5302,6 +5318,7 @@ msgstr "Dán các ô bảng tạm vào ma trận tại ô hiện tại"
#: common/grid_tricks.cpp:331 common/tool/actions.cpp:192
#: kicad/project_tree_pane.cpp:762 pcbnew/dialogs/panel_setup_rules.cpp:114
#: pcbnew/plugins/kicad/pcb_parser.cpp:923 pcbnew/tools/edit_tool.cpp:1975
+#: pcbnew/tools/edit_tool.cpp:1973
msgid "Delete"
msgstr "Xóa bỏ"
@@ -5347,7 +5364,7 @@ msgstr "Thêm vào Lựa chọn"
#: common/hotkey_store.cpp:47 eeschema/tools/ee_actions.cpp:582
#: gerbview/tools/gerbview_actions.cpp:119 pcbnew/tools/pcb_actions.cpp:790
-#: pcbnew/tools/pcb_actions.cpp:810
+#: pcbnew/tools/pcb_actions.cpp:810 eeschema/tools/ee_actions.cpp:583
msgid "Highlight Net"
msgstr "Tô sáng Net"
@@ -5824,6 +5841,7 @@ msgstr "Xóa bỏ (các) khoản mục đã chọn"
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:201
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:212
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:223
+#: eeschema/dialogs/dialog_sim_model.cpp:456
msgid "Unit"
msgstr "Đơn vị"
@@ -6140,15 +6158,15 @@ msgstr "Lỗi: "
msgid "Unable to open %s for reading."
msgstr "Không thể mở tên tệp \"%s\" để đọc"
-#: common/richio.cpp:226 common/richio.cpp:324
+#: common/richio.cpp:226 common/richio.cpp:324 common/richio.cpp:322
msgid "Maximum line length exceeded"
msgstr "Chiều dài dòng tối đa vượt quá"
-#: common/richio.cpp:289
+#: common/richio.cpp:289 common/richio.cpp:288
msgid "Line length exceeded"
msgstr "Chiều dài dòng vượt quá"
-#: common/richio.cpp:573
+#: common/richio.cpp:573 common/richio.cpp:571
msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
msgstr "OUTPUTSTREAM_OUTPUTFORMATTER lỗi ghi"
@@ -6465,17 +6483,18 @@ msgstr "Phóng to tại Con trỏ"
#: common/tool/actions.cpp:325 common/widgets/mathplot.cpp:1678
#: eeschema/sim/sim_plot_frame_base.cpp:87
-#: pcbnew/dialogs/panel_setup_rules.cpp:122
+#: pcbnew/dialogs/panel_setup_rules.cpp:122 common/widgets/mathplot.cpp:1667
msgid "Zoom In"
msgstr "Phóng to"
#: common/tool/actions.cpp:331 common/widgets/mathplot.cpp:1679
#: eeschema/sim/sim_plot_frame_base.cpp:91
-#: pcbnew/dialogs/panel_setup_rules.cpp:123
+#: pcbnew/dialogs/panel_setup_rules.cpp:123 common/widgets/mathplot.cpp:1668
msgid "Zoom Out"
msgstr "Thu nhỏ"
#: common/tool/actions.cpp:337 common/widgets/mathplot.cpp:1676
+#: common/widgets/mathplot.cpp:1665
#, fuzzy
msgid "Center on Cursor"
msgstr "Kích thước trung tâm"
@@ -6639,6 +6658,7 @@ msgid "Use millimeters"
msgstr "Sử dụng milimét"
#: common/tool/actions.cpp:518 common/widgets/lib_tree.cpp:674
+#: common/widgets/lib_tree.cpp:665
#, fuzzy
msgid "Select Columns"
msgstr "Chọn Không có"
@@ -7084,26 +7104,27 @@ msgstr "Chọn Đường dẫn"
msgid "recent searches"
msgstr ""
-#: common/widgets/mathplot.cpp:1676
+#: common/widgets/mathplot.cpp:1676 common/widgets/mathplot.cpp:1665
#, fuzzy
msgid "Center plot view to this position"
msgstr "Trung tâm bản in hiển thị đến vị trí này"
#: common/widgets/mathplot.cpp:1677 eeschema/sim/sim_plot_frame_base.cpp:95
+#: common/widgets/mathplot.cpp:1666
#, fuzzy
msgid "Fit on Screen"
msgstr "Tràn trên Màn hình"
-#: common/widgets/mathplot.cpp:1677
+#: common/widgets/mathplot.cpp:1677 common/widgets/mathplot.cpp:1666
msgid "Set plot view to show all items"
msgstr "Cài đặt dạng xem bản in để hiển thị tất cả các mục"
-#: common/widgets/mathplot.cpp:1678
+#: common/widgets/mathplot.cpp:1678 common/widgets/mathplot.cpp:1667
#, fuzzy
msgid "Zoom in plot view."
msgstr "Phóng to vùng hiển thị bản in"
-#: common/widgets/mathplot.cpp:1679
+#: common/widgets/mathplot.cpp:1679 common/widgets/mathplot.cpp:1668
#, fuzzy
msgid "Zoom out plot view."
msgstr "Thu nhỏ chế độ xem bản in"
@@ -7141,16 +7162,19 @@ msgstr "Đặt lại về Mặc định"
#: common/widgets/properties_panel.cpp:69
#: common/widgets/properties_panel.cpp:147
+#: common/widgets/properties_panel.cpp:141
#, fuzzy
msgid "No objects selected"
msgstr "Không có symbol nào được chọn"
#: common/widgets/properties_panel.cpp:161
+#: common/widgets/properties_panel.cpp:155
#, fuzzy, c-format
msgid "%d objects selected"
msgstr "Không có symbol nào được chọn"
#: common/widgets/properties_panel.cpp:280
+#: common/widgets/properties_panel.cpp:274
#, fuzzy
msgid "Basic Properties"
msgstr "Thuộc tính Văn bản"
@@ -7718,7 +7742,7 @@ msgid "Configuration Error"
msgstr "Lỗi Cấu hình"
#: cvpcb/cvpcb_mainframe.cpp:910 pcbnew/footprint_edit_frame.cpp:939
-#: pcbnew/load_select_footprint.cpp:225
+#: pcbnew/load_select_footprint.cpp:225 pcbnew/footprint_edit_frame.cpp:937
msgid "Loading Footprint Libraries"
msgstr "Đang tải Thư viện Footprint"
@@ -8158,13 +8182,13 @@ msgstr ""
"Net %s được kết nối bằng đồ thị với bus %s nhưng không phải là thành viên "
"của bus đó"
-#: eeschema/connection_graph.cpp:3266
+#: eeschema/connection_graph.cpp:3266 eeschema/connection_graph.cpp:3259
#, fuzzy, c-format
msgid "Sheet pin %s has no matching hierarchical label inside the sheet"
msgstr ""
"chân pin trang tính %s không có nhãn phân cấp phù hợp bên trong trang tính"
-#: eeschema/connection_graph.cpp:3283
+#: eeschema/connection_graph.cpp:3283 eeschema/connection_graph.cpp:3276
#, fuzzy, c-format
msgid "Hierarchical label %s has no matching sheet pin in the parent sheet"
msgstr ""
@@ -8453,12 +8477,12 @@ msgid ""
"python