diff --git a/installer/Migration/V3_3_3/dbscript-2.sql b/installer/Migration/V3_3_3/dbscript-2.sql
index 2144add..1bb4457 100755
--- a/installer/Migration/V3_3_3/dbscript-2.sql
+++ b/installer/Migration/V3_3_3/dbscript-2.sql
@@ -1,470 +1,15 @@
-INSERT INTO `hs_hr_country`(`cou_code`, `name`, `cou_name`, `iso3`, `numcode`) VALUES ('AF', 'AFGHANISTAN', 'Afghanistan', 'AFG', 4),
-    ('AL', 'ALBANIA', 'Albania', 'ALB', 8),
-    ('DZ', 'ALGERIA', 'Algeria', 'DZA', 12),
-    ('AS', 'AMERICAN SAMOA', 'American Samoa', 'ASM', 16),
-    ('AD', 'ANDORRA', 'Andorra', 'AND', 20),
-    ('AO', 'ANGOLA', 'Angola', 'AGO', 24),
-    ('AI', 'ANGUILLA', 'Anguilla', 'AIA', 660),
-    ('AQ', 'ANTARCTICA', 'Antarctica', NULL, NULL),
-    ('AG', 'ANTIGUA AND BARBUDA', 'Antigua and Barbuda', 'ATG', 28),
-    ('AR', 'ARGENTINA', 'Argentina', 'ARG', 32),
-    ('AM', 'ARMENIA', 'Armenia', 'ARM', 51),
-    ('AW', 'ARUBA', 'Aruba', 'ABW', 533),
-    ('AU', 'AUSTRALIA', 'Australia', 'AUS', 36),
-    ('AT', 'AUSTRIA', 'Austria', 'AUT', 40),
-    ('AZ', 'AZERBAIJAN', 'Azerbaijan', 'AZE', 31),
-    ('BS', 'BAHAMAS', 'Bahamas', 'BHS', 44),
-    ('BH', 'BAHRAIN', 'Bahrain', 'BHR', 48),
-    ('BD', 'BANGLADESH', 'Bangladesh', 'BGD', 50),
-    ('BB', 'BARBADOS', 'Barbados', 'BRB', 52),
-    ('BY', 'BELARUS', 'Belarus', 'BLR', 112),
-    ('BE', 'BELGIUM', 'Belgium', 'BEL', 56),
-    ('BZ', 'BELIZE', 'Belize', 'BLZ', 84),
-    ('BJ', 'BENIN', 'Benin', 'BEN', 204),
-    ('BM', 'BERMUDA', 'Bermuda', 'BMU', 60),
-    ('BT', 'BHUTAN', 'Bhutan', 'BTN', 64),
-    ('BO', 'BOLIVIA', 'Bolivia', 'BOL', 68),
-    ('BA', 'BOSNIA AND HERZEGOVINA', 'Bosnia and Herzegovina', 'BIH', 70),
-    ('BW', 'BOTSWANA', 'Botswana', 'BWA', 72),
-    ('BV', 'BOUVET ISLAND', 'Bouvet Island', NULL, NULL),
-    ('BR', 'BRAZIL', 'Brazil', 'BRA', 76),
-    ('IO', 'BRITISH INDIAN OCEAN TERRITORY', 'British Indian Ocean Territory', NULL, NULL),
-    ('BN', 'BRUNEI DARUSSALAM', 'Brunei Darussalam', 'BRN', 96),
-    ('BG', 'BULGARIA', 'Bulgaria', 'BGR', 100),
-    ('BF', 'BURKINA FASO', 'Burkina Faso', 'BFA', 854),
-    ('BI', 'BURUNDI', 'Burundi', 'BDI', 108),
-    ('KH', 'CAMBODIA', 'Cambodia', 'KHM', 116),
-    ('CM', 'CAMEROON', 'Cameroon', 'CMR', 120),
-    ('CA', 'CANADA', 'Canada', 'CAN', 124),
-    ('CV', 'CAPE VERDE', 'Cape Verde', 'CPV', 132),
-    ('KY', 'CAYMAN ISLANDS', 'Cayman Islands', 'CYM', 136),
-    ('CF', 'CENTRAL AFRICAN REPUBLIC', 'Central African Republic', 'CAF', 140),
-    ('TD', 'CHAD', 'Chad', 'TCD', 148),
-    ('CL', 'CHILE', 'Chile', 'CHL', 152),
+INSERT INTO `hs_hr_country`(`cou_code`, `name`, `cou_name`, `iso3`, `numcode`) VALUES 
     ('CN', 'CHINA', 'China', 'CHN', 156),
-    ('CX', 'CHRISTMAS ISLAND', 'Christmas Island', NULL, NULL),
-    ('CC', 'COCOS (KEELING) ISLANDS', 'Cocos (Keeling) Islands', NULL, NULL),
-    ('CO', 'COLOMBIA', 'Colombia', 'COL', 170),
-    ('KM', 'COMOROS', 'Comoros', 'COM', 174),
-    ('CG', 'CONGO', 'Congo', 'COG', 178),
-    ('CD', 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', 'Congo, the Democratic Republic of the', 'COD', 180),
-    ('CK', 'COOK ISLANDS', 'Cook Islands', 'COK', 184),
-    ('CR', 'COSTA RICA', 'Costa Rica', 'CRI', 188),
-    ('CI', 'COTE D''IVOIRE', 'Cote D''Ivoire', 'CIV', 384),
-    ('HR', 'CROATIA', 'Croatia', 'HRV', 191),
-    ('CU', 'CUBA', 'Cuba', 'CUB', 192),
-    ('CY', 'CYPRUS', 'Cyprus', 'CYP', 196),
-    ('CZ', 'CZECH REPUBLIC', 'Czech Republic', 'CZE', 203),
-    ('DK', 'DENMARK', 'Denmark', 'DNK', 208),
-    ('DJ', 'DJIBOUTI', 'Djibouti', 'DJI', 262),
-    ('DM', 'DOMINICA', 'Dominica', 'DMA', 212),
-    ('DO', 'DOMINICAN REPUBLIC', 'Dominican Republic', 'DOM', 214),
-    ('EC', 'ECUADOR', 'Ecuador', 'ECU', 218),
-    ('EG', 'EGYPT', 'Egypt', 'EGY', 818),
-    ('SV', 'EL SALVADOR', 'El Salvador', 'SLV', 222),
-    ('GQ', 'EQUATORIAL GUINEA', 'Equatorial Guinea', 'GNQ', 226),
-    ('ER', 'ERITREA', 'Eritrea', 'ERI', 232),
-    ('EE', 'ESTONIA', 'Estonia', 'EST', 233),
-    ('ET', 'ETHIOPIA', 'Ethiopia', 'ETH', 231),
-    ('FK', 'FALKLAND ISLANDS (MALVINAS)', 'Falkland Islands (Malvinas)', 'FLK', 238),
-    ('FO', 'FAROE ISLANDS', 'Faroe Islands', 'FRO', 234),
-    ('FJ', 'FIJI', 'Fiji', 'FJI', 242),
-    ('FI', 'FINLAND', 'Finland', 'FIN', 246),
-    ('FR', 'FRANCE', 'France', 'FRA', 250),
-    ('GF', 'FRENCH GUIANA', 'French Guiana', 'GUF', 254),
-    ('PF', 'FRENCH POLYNESIA', 'French Polynesia', 'PYF', 258),
-    ('TF', 'FRENCH SOUTHERN TERRITORIES', 'French Southern Territories', NULL, NULL),
-    ('GA', 'GABON', 'Gabon', 'GAB', 266),
-    ('GM', 'GAMBIA', 'Gambia', 'GMB', 270),
-    ('GE', 'GEORGIA', 'Georgia', 'GEO', 268),
-    ('DE', 'GERMANY', 'Germany', 'DEU', 276),
-    ('GH', 'GHANA', 'Ghana', 'GHA', 288),
-    ('GI', 'GIBRALTAR', 'Gibraltar', 'GIB', 292),
-    ('GR', 'GREECE', 'Greece', 'GRC', 300),
-    ('GL', 'GREENLAND', 'Greenland', 'GRL', 304),
-    ('GD', 'GRENADA', 'Grenada', 'GRD', 308),
-    ('GP', 'GUADELOUPE', 'Guadeloupe', 'GLP', 312),
-    ('GU', 'GUAM', 'Guam', 'GUM', 316),
-    ('GT', 'GUATEMALA', 'Guatemala', 'GTM', 320),
-    ('GN', 'GUINEA', 'Guinea', 'GIN', 324),
-    ('GW', 'GUINEA-BISSAU', 'Guinea-Bissau', 'GNB', 624),
-    ('GY', 'GUYANA', 'Guyana', 'GUY', 328),
-    ('HT', 'HAITI', 'Haiti', 'HTI', 332),
-    ('HM', 'HEARD ISLAND AND MCDONALD ISLANDS', 'Heard Island and Mcdonald Islands', NULL, NULL),
-    ('VA', 'HOLY SEE (VATICAN CITY STATE)', 'Holy See (Vatican City State)', 'VAT', 336),
-    ('HN', 'HONDURAS', 'Honduras', 'HND', 340),
     ('HK', 'HONG KONG', 'Hong Kong', 'HKG', 344),
-    ('HU', 'HUNGARY', 'Hungary', 'HUN', 348),
-    ('IS', 'ICELAND', 'Iceland', 'ISL', 352),
-    ('IN', 'INDIA', 'India', 'IND', 356),
-    ('ID', 'INDONESIA', 'Indonesia', 'IDN', 360),
-    ('IR', 'IRAN, ISLAMIC REPUBLIC OF', 'Iran, Islamic Republic of', 'IRN', 364),
-    ('IQ', 'IRAQ', 'Iraq', 'IRQ', 368),
-    ('IE', 'IRELAND', 'Ireland', 'IRL', 372),
-    ('IL', 'ISRAEL', 'Israel', 'ISR', 376),
-    ('IT', 'ITALY', 'Italy', 'ITA', 380),
-    ('JM', 'JAMAICA', 'Jamaica', 'JAM', 388),
-    ('JP', 'JAPAN', 'Japan', 'JPN', 392),
-    ('JO', 'JORDAN', 'Jordan', 'JOR', 400),
-    ('KZ', 'KAZAKHSTAN', 'Kazakhstan', 'KAZ', 398),
-    ('KE', 'KENYA', 'Kenya', 'KEN', 404),
-    ('KI', 'KIRIBATI', 'Kiribati', 'KIR', 296),
-    ('KP', 'KOREA, DEMOCRATIC PEOPLE''S REPUBLIC OF', 'Korea, Democratic People''s Republic of', 'PRK', 408),
-    ('KR', 'KOREA, REPUBLIC OF', 'Korea, Republic of', 'KOR', 410),
-    ('KW', 'KUWAIT', 'Kuwait', 'KWT', 414),
-    ('KG', 'KYRGYZSTAN', 'Kyrgyzstan', 'KGZ', 417),
-    ('LA', 'LAO PEOPLE''S DEMOCRATIC REPUBLIC', 'Lao People''s Democratic Republic', 'LAO', 418),
-    ('LV', 'LATVIA', 'Latvia', 'LVA', 428),
-    ('LB', 'LEBANON', 'Lebanon', 'LBN', 422),
-    ('LS', 'LESOTHO', 'Lesotho', 'LSO', 426),
-    ('LR', 'LIBERIA', 'Liberia', 'LBR', 430),
-    ('LY', 'LIBYAN ARAB JAMAHIRIYA', 'Libyan Arab Jamahiriya', 'LBY', 434),
-    ('LI', 'LIECHTENSTEIN', 'Liechtenstein', 'LIE', 438),
-    ('LT', 'LITHUANIA', 'Lithuania', 'LTU', 440),
-    ('LU', 'LUXEMBOURG', 'Luxembourg', 'LUX', 442),
-    ('MO', 'MACAO', 'Macao', 'MAC', 446),
-    ('MK', 'MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF', 'Macedonia, the Former Yugoslav Republic of', 'MKD', 807),
-    ('MG', 'MADAGASCAR', 'Madagascar', 'MDG', 450),
-    ('MW', 'MALAWI', 'Malawi', 'MWI', 454),
-    ('MY', 'MALAYSIA', 'Malaysia', 'MYS', 458),
-    ('MV', 'MALDIVES', 'Maldives', 'MDV', 462),
-    ('ML', 'MALI', 'Mali', 'MLI', 466),
-    ('MT', 'MALTA', 'Malta', 'MLT', 470),
-    ('MH', 'MARSHALL ISLANDS', 'Marshall Islands', 'MHL', 584),
-    ('MQ', 'MARTINIQUE', 'Martinique', 'MTQ', 474),
-    ('MR', 'MAURITANIA', 'Mauritania', 'MRT', 478),
-    ('MU', 'MAURITIUS', 'Mauritius', 'MUS', 480),
-    ('YT', 'MAYOTTE', 'Mayotte', NULL, NULL),
-    ('MX', 'MEXICO', 'Mexico', 'MEX', 484),
-    ('FM', 'MICRONESIA, FEDERATED STATES OF', 'Micronesia, Federated States of', 'FSM', 583),
-    ('MD', 'MOLDOVA, REPUBLIC OF', 'Moldova, Republic of', 'MDA', 498),
-    ('MC', 'MONACO', 'Monaco', 'MCO', 492),
-    ('MN', 'MONGOLIA', 'Mongolia', 'MNG', 496),
-    ('MS', 'MONTSERRAT', 'Montserrat', 'MSR', 500),
-    ('MA', 'MOROCCO', 'Morocco', 'MAR', 504),
-    ('MZ', 'MOZAMBIQUE', 'Mozambique', 'MOZ', 508),
-    ('MM', 'MYANMAR', 'Myanmar', 'MMR', 104),
-    ('NA', 'NAMIBIA', 'Namibia', 'NAM', 516),
-    ('NR', 'NAURU', 'Nauru', 'NRU', 520),
-    ('NP', 'NEPAL', 'Nepal', 'NPL', 524),
-    ('NL', 'NETHERLANDS', 'Netherlands', 'NLD', 528),
-    ('AN', 'NETHERLANDS ANTILLES', 'Netherlands Antilles', 'ANT', 530),
-    ('NC', 'NEW CALEDONIA', 'New Caledonia', 'NCL', 540),
-    ('NZ', 'NEW ZEALAND', 'New Zealand', 'NZL', 554),
-    ('NI', 'NICARAGUA', 'Nicaragua', 'NIC', 558),
-    ('NE', 'NIGER', 'Niger', 'NER', 562),
-    ('NG', 'NIGERIA', 'Nigeria', 'NGA', 566),
-    ('NU', 'NIUE', 'Niue', 'NIU', 570),
-    ('NF', 'NORFOLK ISLAND', 'Norfolk Island', 'NFK', 574),
-    ('MP', 'NORTHERN MARIANA ISLANDS', 'Northern Mariana Islands', 'MNP', 580),
-    ('NO', 'NORWAY', 'Norway', 'NOR', 578),
-    ('OM', 'OMAN', 'Oman', 'OMN', 512),
-    ('PK', 'PAKISTAN', 'Pakistan', 'PAK', 586),
-    ('PW', 'PALAU', 'Palau', 'PLW', 585),
-    ('PS', 'PALESTINIAN TERRITORY, OCCUPIED', 'Palestinian Territory, Occupied', NULL, NULL),
-    ('PA', 'PANAMA', 'Panama', 'PAN', 591),
-    ('PG', 'PAPUA NEW GUINEA', 'Papua New Guinea', 'PNG', 598),
-    ('PY', 'PARAGUAY', 'Paraguay', 'PRY', 600),
-    ('PE', 'PERU', 'Peru', 'PER', 604),
-    ('PH', 'PHILIPPINES', 'Philippines', 'PHL', 608),
-    ('PN', 'PITCAIRN', 'Pitcairn', 'PCN', 612),
-    ('PL', 'POLAND', 'Poland', 'POL', 616),
-    ('PT', 'PORTUGAL', 'Portugal', 'PRT', 620),
-    ('PR', 'PUERTO RICO', 'Puerto Rico', 'PRI', 630),
-    ('QA', 'QATAR', 'Qatar', 'QAT', 634),
-    ('RE', 'REUNION', 'Reunion', 'REU', 638),
-    ('RO', 'ROMANIA', 'Romania', 'ROM', 642),
-    ('RU', 'RUSSIAN FEDERATION', 'Russian Federation', 'RUS', 643),
-    ('RW', 'RWANDA', 'Rwanda', 'RWA', 646),
-    ('SH', 'SAINT HELENA', 'Saint Helena', 'SHN', 654),
-    ('KN', 'SAINT KITTS AND NEVIS', 'Saint Kitts and Nevis', 'KNA', 659),
-    ('LC', 'SAINT LUCIA', 'Saint Lucia', 'LCA', 662),
-    ('PM', 'SAINT PIERRE AND MIQUELON', 'Saint Pierre and Miquelon', 'SPM', 666),
-    ('VC', 'SAINT VINCENT AND THE GRENADINES', 'Saint Vincent and the Grenadines', 'VCT', 670),
-    ('WS', 'SAMOA', 'Samoa', 'WSM', 882),
-    ('SM', 'SAN MARINO', 'San Marino', 'SMR', 674),
-    ('ST', 'SAO TOME AND PRINCIPE', 'Sao Tome and Principe', 'STP', 678),
-    ('SA', 'SAUDI ARABIA', 'Saudi Arabia', 'SAU', 682),
-    ('SN', 'SENEGAL', 'Senegal', 'SEN', 686),
-    ('CS', 'SERBIA AND MONTENEGRO', 'Serbia and Montenegro', NULL, NULL),
-    ('SC', 'SEYCHELLES', 'Seychelles', 'SYC', 690),
-    ('SL', 'SIERRA LEONE', 'Sierra Leone', 'SLE', 694),
-    ('SG', 'SINGAPORE', 'Singapore', 'SGP', 702),
-    ('SK', 'SLOVAKIA', 'Slovakia', 'SVK', 703),
-    ('SI', 'SLOVENIA', 'Slovenia', 'SVN', 705),
-    ('SB', 'SOLOMON ISLANDS', 'Solomon Islands', 'SLB', 90),
-    ('SO', 'SOMALIA', 'Somalia', 'SOM', 706),
-    ('ZA', 'SOUTH AFRICA', 'South Africa', 'ZAF', 710),
-    ('GS', 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS', 'South Georgia and the South Sandwich Islands', NULL, NULL),
-    ('ES', 'SPAIN', 'Spain', 'ESP', 724),
-    ('LK', 'SRI LANKA', 'Sri Lanka', 'LKA', 144),
-    ('SD', 'SUDAN', 'Sudan', 'SDN', 736),
-    ('SR', 'SURINAME', 'Suriname', 'SUR', 740),
-    ('SJ', 'SVALBARD AND JAN MAYEN', 'Svalbard and Jan Mayen', 'SJM', 744),
-    ('SZ', 'SWAZILAND', 'Swaziland', 'SWZ', 748),
-    ('SE', 'SWEDEN', 'Sweden', 'SWE', 752),
-    ('CH', 'SWITZERLAND', 'Switzerland', 'CHE', 756),
-    ('SY', 'SYRIAN ARAB REPUBLIC', 'Syrian Arab Republic', 'SYR', 760),
-    ('TW', 'TAIWAN, PROVINCE OF CHINA', 'Taiwan', 'TWN', 158),
-    ('TJ', 'TAJIKISTAN', 'Tajikistan', 'TJK', 762),
-    ('TZ', 'TANZANIA, UNITED REPUBLIC OF', 'Tanzania, United Republic of', 'TZA', 834),
-    ('TH', 'THAILAND', 'Thailand', 'THA', 764),
-    ('TL', 'TIMOR-LESTE', 'Timor-Leste', NULL, NULL),
-    ('TG', 'TOGO', 'Togo', 'TGO', 768),
-    ('TK', 'TOKELAU', 'Tokelau', 'TKL', 772),
-    ('TO', 'TONGA', 'Tonga', 'TON', 776),
-    ('TT', 'TRINIDAD AND TOBAGO', 'Trinidad and Tobago', 'TTO', 780),
-    ('TN', 'TUNISIA', 'Tunisia', 'TUN', 788),
-    ('TR', 'TURKEY', 'Turkey', 'TUR', 792),
-    ('TM', 'TURKMENISTAN', 'Turkmenistan', 'TKM', 795),
-    ('TC', 'TURKS AND CAICOS ISLANDS', 'Turks and Caicos Islands', 'TCA', 796),
-    ('TV', 'TUVALU', 'Tuvalu', 'TUV', 798),
-    ('UG', 'UGANDA', 'Uganda', 'UGA', 800),
-    ('UA', 'UKRAINE', 'Ukraine', 'UKR', 804),
-    ('AE', 'UNITED ARAB EMIRATES', 'United Arab Emirates', 'ARE', 784),
-    ('GB', 'UNITED KINGDOM', 'United Kingdom', 'GBR', 826),
-    ('US', 'UNITED STATES', 'United States', 'USA', 840),
-    ('UM', 'UNITED STATES MINOR OUTLYING ISLANDS', 'United States Minor Outlying Islands', NULL, NULL),
-    ('UY', 'URUGUAY', 'Uruguay', 'URY', 858),
-    ('UZ', 'UZBEKISTAN', 'Uzbekistan', 'UZB', 860),
-    ('VU', 'VANUATU', 'Vanuatu', 'VUT', 548),
-    ('VE', 'VENEZUELA', 'Venezuela', 'VEN', 862),
-    ('VN', 'VIET NAM', 'Viet Nam', 'VNM', 704),
-    ('VG', 'VIRGIN ISLANDS, BRITISH', 'Virgin Islands, British', 'VGB', 92),
-    ('VI', 'VIRGIN ISLANDS, U.S.', 'Virgin Islands, U.s.', 'VIR', 850),
-    ('WF', 'WALLIS AND FUTUNA', 'Wallis and Futuna', 'WLF', 876),
-    ('EH', 'WESTERN SAHARA', 'Western Sahara', 'ESH', 732),
-    ('YE', 'YEMEN', 'Yemen', 'YEM', 887),
-    ('ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894),
-    ('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716);
+    ('MO', 'MACAO', 'Macao', 'MAC', 446);
 
   
-INSERT INTO `hs_hr_currency_type`(`code`, `currency_id`, `currency_name`) VALUES (3, 'AED', 'Utd. Arab Emir. Dirham'),
-    (4, 'AFN', 'Afghanistan Afghani'),
-    (5, 'ALL', 'Albanian Lek'),
-    (6, 'ANG', 'NL Antillian Guilder'),
-    (7, 'AOR', 'Angolan New Kwanza'),
-    (177, 'ARP', 'Argentina Pesos'),
-    (8, 'ARS', 'Argentine Peso'),
-    (10, 'AUD', 'Australian Dollar'),
-    (11, 'AWG', 'Aruban Florin'),
-    (12, 'BBD', 'Barbados Dollar'),
-    (13, 'BDT', 'Bangladeshi Taka'),
-    (15, 'BGL', 'Bulgarian Lev'),
-    (16, 'BHD', 'Bahraini Dinar'),
-    (17, 'BIF', 'Burundi Franc'),
-    (18, 'BMD', 'Bermudian Dollar'),
-    (19, 'BND', 'Brunei Dollar'),
-    (20, 'BOB', 'Bolivian Boliviano'),
-    (21, 'BRL', 'Brazilian Real'),
-    (22, 'BSD', 'Bahamian Dollar'),
-    (23, 'BTN', 'Bhutan Ngultrum'),
-    (24, 'BWP', 'Botswana Pula'),
-    (25, 'BZD', 'Belize Dollar'),
-    (26, 'CAD', 'Canadian Dollar'),
-    (27, 'CHF', 'Swiss Franc'),
-    (28, 'CLP', 'Chilean Peso'),
-    (29, 'CNY', 'Chinese Yuan Renminbi'),
-    (30, 'COP', 'Colombian Peso'),
-    (31, 'CRC', 'Costa Rican Colon'),
-    (171, 'CZK', 'Czech Koruna'),
-    (32, 'CUP', 'Cuban Peso'),
-    (33, 'CVE', 'Cape Verde Escudo'),
-    (34, 'CYP', 'Cyprus Pound'),
-    (37, 'DJF', 'Djibouti Franc'),
-    (38, 'DKK', 'Danish Krona'),
-    (39, 'DOP', 'Dominican Peso'),
-    (40, 'DZD', 'Algerian Dinar'),
-    (41, 'ECS', 'Ecuador Sucre'),
-    (43, 'EEK', 'Estonian Krona'),
-    (44, 'EGP', 'Egyptian Pound'),
-    (46, 'ETB', 'Ethiopian Birr'),
-    (42, 'EUR', 'Euro'),
-    (48, 'FJD', 'Fiji Dollar'),
-    (49, 'FKP', 'Falkland Islands Pound'),
-    (51, 'GBP', 'Pound Sterling'),
-    (52, 'GHC', 'Ghanaian Cedi'),
-    (53, 'GIP', 'Gibraltar Pound'),
-    (54, 'GMD', 'Gambian Dalasi'),
-    (55, 'GNF', 'Guinea Franc'),
-    (57, 'GTQ', 'Guatemalan Quetzal'),
-    (58, 'GYD', 'Guyanan Dollar'),
-    (59, 'HKD', 'Hong Kong Dollar'),
-    (60, 'HNL', 'Honduran Lempira'),
-    (61, 'HRK', 'Croatian Kuna'),
-    (62, 'HTG', 'Haitian Gourde'),
-    (63, 'HUF', 'Hungarian Forint'),
-    (64, 'IDR', 'Indonesian Rupiah'),
-    (66, 'ILS', 'Israeli New Shekel'),
-    (67, 'INR', 'Indian Rupee'),
-    (68, 'IQD', 'Iraqi Dinar'),
-    (69, 'IRR', 'Iranian Rial'),
-    (70, 'ISK', 'Iceland Krona'),
-    (72, 'JMD', 'Jamaican Dollar'),
-    (73, 'JOD', 'Jordanian Dinar'),
-    (74, 'JPY', 'Japanese Yen'),
-    (75, 'KES', 'Kenyan Shilling'),
-    (76, 'KHR', 'Kampuchean Riel'),
-    (77, 'KMF', 'Comoros Franc'),
-    (78, 'KPW', 'North Korean Won'),
-    (79, 'KRW', 'Korean Won'),
-    (80, 'KWD', 'Kuwaiti Dinar'),
-    (81, 'KYD', 'Cayman Islands Dollar'),
-    (82, 'KZT', 'Kazakhstan Tenge'),
-    (83, 'LAK', 'Lao Kip'),
-    (84, 'LBP', 'Lebanese Pound'),
-    (85, 'LKR', 'Sri Lanka Rupee'),
-    (86, 'LRD', 'Liberian Dollar'),
-    (87, 'LSL', 'Lesotho Loti'),
-    (88, 'LTL', 'Lithuanian Litas'),
-    (90, 'LVL', 'Latvian Lats'),
-    (91, 'LYD', 'Libyan Dinar'),
-    (92, 'MAD', 'Moroccan Dirham'),
-    (93, 'MGF', 'Malagasy Franc'),
-    (94, 'MMK', 'Myanmar Kyat'),
-    (95, 'MNT', 'Mongolian Tugrik'),
-    (96, 'MOP', 'Macau Pataca'),
-    (97, 'MRO', 'Mauritanian Ouguiya'),
-    (98, 'MTL', 'Maltese Lira'),
-    (99, 'MUR', 'Mauritius Rupee'),
-    (100, 'MVR', 'Maldive Rufiyaa'),
-    (101, 'MWK', 'Malawi Kwacha'),
-    (102, 'MXN', 'Mexican New Peso'),
-    (172, 'MXP', 'Mexican Peso'),
-    (103, 'MYR', 'Malaysian Ringgit'),
-    (104, 'MZM', 'Mozambique Metical'),
-    (105, 'NAD', 'Namibia Dollar'),
-    (106, 'NGN', 'Nigerian Naira'),
-    (107, 'NIO', 'Nicaraguan Cordoba Oro'),
-    (109, 'NOK', 'Norwegian Krona'),
-    (110, 'NPR', 'Nepalese Rupee'),
-    (111, 'NZD', 'New Zealand Dollar'),
-    (112, 'OMR', 'Omani Rial'),
-    (113, 'PAB', 'Panamanian Balboa'),
-    (114, 'PEN', 'Peruvian Nuevo Sol'),
-    (115, 'PGK', 'Papua New Guinea Kina'),
-    (116, 'PHP', 'Philippine Peso'),
-    (117, 'PKR', 'Pakistan Rupee'),
-    (118, 'PLN', 'Polish Zloty'),
-    (120, 'PYG', 'Paraguay Guarani'),
-    (121, 'QAR', 'Qatari Rial'),
-    (122, 'ROL', 'Romanian Leu'),
-    (123, 'RUB', 'Russian Rouble'),
-    (180, 'RUR', 'Russia Rubles'),
-    (125, 'SBD', 'Solomon Islands Dollar'),
-    (126, 'SCR', 'Seychelles Rupee'),
-    (127, 'SDD', 'Sudanese Dinar'),
-    (128, 'SDP', 'Sudanese Pound'),
-    (129, 'SEK', 'Swedish Krona'),
-    (131, 'SGD', 'Singapore Dollar'),
-    (132, 'SHP', 'St. Helena Pound'),
-    (130, 'SKK', 'Slovak Koruna'),
-    (135, 'SLL', 'Sierra Leone Leone'),
-    (136, 'SOS', 'Somali Shilling'),
-    (137, 'SRD', 'Surinamese Dollar'),
-    (138, 'STD', 'Sao Tome/Principe Dobra'),
-    (139, 'SVC', 'El Salvador Colon'),
-    (140, 'SYP', 'Syrian Pound'),
-    (141, 'SZL', 'Swaziland Lilangeni'),
-    (142, 'THB', 'Thai Baht'),
-    (143, 'TND', 'Tunisian Dinar'),
-    (144, 'TOP', 'Tongan Pa''anga'),
-    (145, 'TRL', 'Turkish Lira'),
-    (146, 'TTD', 'Trinidad/Tobago Dollar'),
-    (147, 'TWD', 'Taiwan Dollar'),
-    (148, 'TZS', 'Tanzanian Shilling'),
-    (149, 'UAH', 'Ukraine Hryvnia'),
-    (150, 'UGX', 'Uganda Shilling'),
-    (151, 'USD', 'United States Dollar'),
-    (152, 'UYP', 'Uruguayan Peso'),
-    (153, 'VEB', 'Venezuelan Bolivar'),
-    (154, 'VND', 'Vietnamese Dong'),
-    (155, 'VUV', 'Vanuatu Vatu'),
-    (156, 'WST', 'Samoan Tala'),
-    (158, 'XAF', 'CFA Franc BEAC'),
-    (159, 'XAG', 'Silver (oz.)'),
-    (160, 'XAU', 'Gold (oz.)'),
-    (161, 'XCD', 'Eastern Caribbean Dollars'),
-    (179, 'XDR', 'IMF Special Drawing Right'),
-    (162, 'XOF', 'CFA Franc BCEAO'),
-    (163, 'XPD', 'Palladium (oz.)'),
-    (164, 'XPF', 'CFP Franc'),
-    (165, 'XPT', 'Platinum (oz.)'),
-    (166, 'YER', 'Yemeni Riyal'),
-    (167, 'YUM', 'Yugoslavian Dinar'),
-    (175, 'YUN', 'Yugoslav Dinar'),
-    (168, 'ZAR', 'South African Rand'),
-    (176, 'ZMK', 'Zambian Kwacha'),
-    (169, 'ZRN', 'New Zaire'),
-    (170, 'ZWD', 'Zimbabwe Dollar'),
-    (173, 'SAR', 'Saudi Arabia Riyal');
+INSERT INTO `hs_hr_currency_type`(`code`, `currency_id`, `currency_name`) VALUES 
+    (29, 'CNY', 'Chinese Yuan Renminbi');
   
 
-INSERT INTO `hs_hr_province`(`id`, `province_name`, `province_code`, `cou_code`) VALUES (1, 'Alaska', 'AK', 'US'),
-    (2, 'Alabama', 'AL', 'US'),
-    (3, 'American Samoa', 'AS', 'US'),
-    (4, 'Arizona', 'AZ', 'US'),
-    (5, 'Arkansas', 'AR', 'US'),
-    (6, 'California', 'CA', 'US'),
-    (7, 'Colorado', 'CO', 'US'),
-    (8, 'Connecticut', 'CT', 'US'),
-    (9, 'Delaware', 'DE', 'US'),
-    (10, 'District of Columbia', 'DC', 'US'),
-    (11, 'Federated States of Micronesia', 'FM', 'US'),
-    (12, 'Florida', 'FL', 'US'),
-    (13, 'Georgia', 'GA', 'US'),
-    (14, 'Guam', 'GU', 'US'),
-    (15, 'Hawaii', 'HI', 'US'),
-    (16, 'Idaho', 'ID', 'US'),
-    (17, 'Illinois', 'IL', 'US'),
-    (18, 'Indiana', 'IN', 'US'),
-    (19, 'Iowa', 'IA', 'US'),
-    (20, 'Kansas', 'KS', 'US'),
-    (21, 'Kentucky', 'KY', 'US'),
-    (22, 'Louisiana', 'LA', 'US'),
-    (23, 'Maine', 'ME', 'US'),
-    (24, 'Marshall Islands', 'MH', 'US'),
-    (25, 'Maryland', 'MD', 'US'),
-    (26, 'Massachusetts', 'MA', 'US'),
-    (27, 'Michigan', 'MI', 'US'),
-    (28, 'Minnesota', 'MN', 'US'),
-    (29, 'Mississippi', 'MS', 'US'),
-    (30, 'Missouri', 'MO', 'US'),
-    (31, 'Montana', 'MT', 'US'),
-    (32, 'Nebraska', 'NE', 'US'),
-    (33, 'Nevada', 'NV', 'US'),
-    (34, 'New Hampshire', 'NH', 'US'),
-    (35, 'New Jersey', 'NJ', 'US'),
-    (36, 'New Mexico', 'NM', 'US'),
-    (37, 'New York', 'NY', 'US'),
-    (38, 'North Carolina', 'NC', 'US'),
-    (39, 'North Dakota', 'ND', 'US'),
-    (40, 'Northern Mariana Islands', 'MP', 'US'),
-    (41, 'Ohio', 'OH', 'US'),
-    (42, 'Oklahoma', 'OK', 'US'),
-    (43, 'Oregon', 'OR', 'US'),
-    (44, 'Palau', 'PW', 'US'),
-    (45, 'Pennsylvania', 'PA', 'US'),
-    (46, 'Puerto Rico', 'PR', 'US'),
-    (47, 'Rhode Island', 'RI', 'US'),
-    (48, 'South Carolina', 'SC', 'US'),
-    (49, 'South Dakota', 'SD', 'US'),
-    (50, 'Tennessee', 'TN', 'US'),
-    (51, 'Texas', 'TX', 'US'),
-    (52, 'Utah', 'UT', 'US'),
-    (53, 'Vermont', 'VT', 'US'),
-    (54, 'Virgin Islands', 'VI', 'US'),
-    (55, 'Virginia', 'VA', 'US'),
-    (56, 'Washington', 'WA', 'US'),
-    (57, 'West Virginia', 'WV', 'US'),
-    (58, 'Wisconsin', 'WI', 'US'),
-    (59, 'Wyoming', 'WY', 'US'),
-    (60, 'Armed Forces Africa', 'AE', 'US'),
-    (61, 'Armed Forces Americas (except Canada)', 'AA', 'US'),
-    (62, 'Armed Forces Canada', 'AE', 'US'),
-    (63, 'Armed Forces Europe', 'AE', 'US'),
-    (64, 'Armed Forces Middle East', 'AE', 'US'),
-    (65, 'Armed Forces Pacific', 'AP', 'US');
+INSERT INTO `hs_hr_province`(`id`, `province_name`, `province_code`, `cou_code`) VALUES 
+    (1, 'Alaska', 'AK', 'CN');
 
 INSERT INTO `hs_hr_module` VALUES ('MOD001','Admin','OrangeHRM','info@orangehrm.com','VER001','HR Admin'),
 								  ('MOD002','PIM','OrangeHRM','info@orangehrm.com','VER001','HR Functions'),
diff --git a/installer/Migration/V5_0_0/translation/zh_Hans_CN.yaml b/installer/Migration/V5_0_0/translation/zh_Hans_CN.yaml
index 2afca61..906b499 100644
--- a/installer/Migration/V5_0_0/translation/zh_Hans_CN.yaml
+++ b/installer/Migration/V5_0_0/translation/zh_Hans_CN.yaml
@@ -1,10 +1,10 @@
 translations:
     - { target: 添加, unitId: add, group: general }
     - { target: 添加附件, unitId: add_attachment, group: general }
-    - { target: 添加员工, unitId: add_employee, group: general }
+    - { target: 添加人员, unitId: add_employee, group: general }
     - { target: 添加人, unitId: added_by, group: pim }
     - { target: 地址, unitId: address, group: admin }
-    - { target: 管理员, unitId: admin, group: general }
+    - { target: 系统配置, unitId: admin, group: general }
     - { target: 年龄组, unitId: age_group, group: pim }
     - { target: '仅允许数字和 + - /（）', unitId: allows_phone_numbers_only, group: general }
     - { target: 已经存在, unitId: already_exists, group: general }
@@ -30,8 +30,8 @@ translations:
     - { target: 合同开始日期, unitId: contract_start_date, group: pim }
     - { target: 国家, unitId: country, group: general }
     - { target: 货币, unitId: currency, group: general }
-    - { target: 当前和过去的员工, unitId: current_and_past_employees, group: general }
-    - { target: 仅当前员工, unitId: current_employees_only, group: general }
+    - { target: 当前和过去的人员, unitId: current_and_past_employees, group: general }
+    - { target: 仅当前人员, unitId: current_employees_only, group: general }
     - { target: 自定义字段, unitId: custom_fields, group: pim }
     - { target: 客户, unitId: customers, group: general }
     - { target: 数据导入, unitId: data_import, group: pim }
@@ -40,7 +40,7 @@ translations:
     - { target: 出生日期, unitId: date_of_birth, group: pim }
     - { target: 天, unitId: days, group: leave }
     - { target: 删除当前, unitId: delete_current, group: general }
-    - { target: 受赡养者, unitId: dependents, group: general }
+    - { target: 家庭成员, unitId: dependents, group: general }
     - { target: 描述, unitId: description, group: general }
     - { target: 直接存款账号, unitId: direct_deposit_account_number, group: pim }
     - { target: 直接存款帐户类型, unitId: direct_deposit_account_type, group: pim }
@@ -58,17 +58,17 @@ translations:
     - { target: 资格审查日期, unitId: eligible_review_date, group: pim }
     - { target: 资格状态, unitId: eligible_status, group: pim }
     - { target: 紧急联络人, unitId: emergency_contacts, group: general }
-    - { target: 员工, unitId: employee, group: general }
-    - { target: 员工的名字, unitId: employee_first_name, group: pim }
-    - { target: 员工识别号, unitId: employee_id, group: general }
-    - { target: 员工姓氏, unitId: employee_last_name, group: pim }
-    - { target: 员工列表, unitId: employee_list, group: general }
-    - { target: 员工中间名, unitId: employee_middle_name, group: pim }
-    - { target: 员工姓名, unitId: employee_name, group: general }
-    - { target: 员工记录, unitId: employee_records, group: general }
-    - { target: 员工报表, unitId: employee_reports, group: general }
-    - { target: 员工工时表, unitId: employee_timesheets, group: general }
-    - { target: 雇佣状态, unitId: employment_status, group: general }
+    - { target: 人员, unitId: employee, group: general }
+    - { target: 人员的名字, unitId: employee_first_name, group: pim }
+    - { target: 人员识别号, unitId: employee_id, group: general }
+    - { target: 人员姓氏, unitId: employee_last_name, group: pim }
+    - { target: 人员列表, unitId: employee_list, group: general }
+    - { target: 人员中间名, unitId: employee_middle_name, group: pim }
+    - { target: 人员姓名, unitId: employee_name, group: general }
+    - { target: 人员记录, unitId: employee_records, group: general }
+    - { target: 人员报表, unitId: employee_reports, group: general }
+    - { target: 人员工时表, unitId: employee_timesheets, group: general }
+    - { target: 人员状态, unitId: employment_status, group: general }
     - { target: 启用, unitId: enabled, group: general }
     - { target: 结束日期, unitId: end_date, group: general }
     - { target: ESS, unitId: ess, group: general }
@@ -89,7 +89,7 @@ translations:
     - { target: 入境, unitId: immigration, group: general }
     - { target: 包括, unitId: include, group: pim }
     - { target: 包括页头, unitId: include_header, group: general }
-    - { target: 包括过去的员工, unitId: include_past_employees, group: leave }
+    - { target: 包括过去的人员, unitId: include_past_employees, group: leave }
     - { target: 发行者, unitId: issued_by, group: pim }
     - { target: 发行日期, unitId: issued_date, group: pim }
     - { target: 工作, unitId: job, group: general }
@@ -117,7 +117,7 @@ translations:
     - { target: 本地化, unitId: localization, group: admin }
     - { target: 位置, unitId: location, group: general }
     - { target: 位置, unitId: locations, group: admin }
-    - { target: 登出, unitId: logout, group: general }
+    - { target: 退出登陆, unitId: logout, group: general }
     - { target: 男, unitId: male, group: general }
     - { target: 婚姻状况, unitId: marital_status, group: pim }
     - { target: 会员, unitId: membership, group: pim }
@@ -140,27 +140,27 @@ translations:
     - { target: 其他, unitId: other, group: pim }
     - { target: 其他电子邮件, unitId: other_email, group: general }
     - { target: 其他识别号, unitId: other_id, group: pim }
-    - { target: 过去的员工, unitId: past_employee, group: maintenance }
-    - { target: 仅过去的员工, unitId: past_employees_only, group: general }
+    - { target: 过去的人员, unitId: past_employee, group: maintenance }
+    - { target: 仅过去的人员, unitId: past_employees_only, group: general }
     - { target: 支付频率, unitId: pay_frequency, group: pim }
     - { target: 薪资等级, unitId: pay_grade, group: general }
     - { target: 薪资等级, unitId: pay_grades, group: admin }
     - { target: 绩效, unitId: performance, group: general }
     - { target: 个人, unitId: personal, group: pim }
-    - { target: 个人信息管理系统, unitId: pim, group: general }
+    - { target: 人员信息, unitId: pim, group: general }
     - { target: 项目日期范围, unitId: project_date_range, group: time }
     - { target: 项目信息, unitId: project_info, group: general }
     - { target: 项目报告, unitId: project_reports, group: general }
     - { target: 项目, unitId: projects, group: general }
     - { target: 上/下班打卡, unitId: punch_in_out, group: general }
-    - { target: 招聘, unitId: recruitment, group: general }
+    - { target: 岗位, unitId: recruitment, group: general }
     - { target: 关系, unitId: relationship, group: pim }
     - { target: 替换当前, unitId: replace_current, group: general }
     - { target: 报告名称, unitId: report_name, group: general }
     - { target: 报告方法, unitId: reporting_method, group: pim }
     - { target: 报告方法, unitId: reporting_methods, group: pim }
     - { target: 报告, unitId: reports, group: general }
-    - { target: 需要, unitId: required, group: general }
+    - { target: 必须填写, unitId: required, group: general }
     - { target: 重置, unitId: reset, group: general }
     - { target: 路由号码, unitId: routing_number, group: pim }
     - { target: 薪资, unitId: salary, group: general }
@@ -192,9 +192,9 @@ translations:
     - { target: 成功保存, unitId: successfully_saved, group: general }
     - { target: 成功更新, unitId: successfully_updated, group: general }
     - { target: 星期日, unitId: sunday, group: general }
-    - { target: 上司, unitId: supervisor, group: pim }
-    - { target: 上司姓名, unitId: supervisor_name, group: pim }
-    - { target: 上司, unitId: supervisors, group: pim }
+    - { target: 上级, unitId: supervisor, group: pim }
+    - { target: 上级姓名, unitId: supervisor_name, group: pim }
+    - { target: 上级, unitId: supervisors, group: pim }
     - { target: 终止原因, unitId: termination_reasons, group: pim }
     - { target: 星期四, unitId: thursday, group: general }
     - { target: 时间, unitId: time, group: general }
@@ -261,16 +261,16 @@ translations:
     - { target: 被取消, unitId: cancelled, group: leave }
     - { target: 添加休假权利, unitId: add_leave_entitlement, group: leave }
     - { target: 权利, unitId: entitlement, group: leave }
-    - { target: 无匹配员工, unitId: no_matching_employees, group: general }
+    - { target: 无匹配人员, unitId: no_matching_employees, group: general }
     - { target: 权利, unitId: entitlements, group: general }
     - { target: 添加权利, unitId: add_entitlements, group: general }
-    - { target: 员工权利, unitId: employee_entitlements, group: general }
+    - { target: 人员权利, unitId: employee_entitlements, group: general }
     - { target: 有效期自, unitId: valid_from, group: leave }
     - { target: 有效期至, unitId: valid_to, group: leave }
-    - { target: 无员工匹配所选的筛选器, unitId: no_employees_match_filters, group: general }
+    - { target: 无人员匹配所选的筛选器, unitId: no_employees_match_filters, group: general }
     - { target: 休假权利和使用报表, unitId: leave_entitlement_and_usage_report, group: leave }
     - { target: 我的休假权利和使用报表, unitId: my_leave_entitlement_and_usage_report, group: leave }
-    - { target: 匹配员工, unitId: matching_employees, group: leave }
+    - { target: 匹配人员, unitId: matching_employees, group: leave }
     - { target: 创建对象, unitId: generate_for, group: leave }
     - { target: 确认, unitId: confirm, group: general }
     - { target: 结束日期应该晚于开始日期, unitId: to_date_should_be_after_from_date, group: general }
@@ -281,7 +281,7 @@ translations:
     - { target: 电子邮箱配置, unitId: email_configuration, group: admin }
     - { target: 电子邮件订阅, unitId: email_subscriptions, group: admin }
     - { target: 关于, unitId: about, group: general }
-    - { target: 员工跟踪器, unitId: employee_trackers, group: general }
+    - { target: 跟踪器, unitId: employee_trackers, group: general }
     - { target: 我的跟踪器, unitId: my_trackers, group: general }
     - { target: 活动, unitId: activities, group: time }
     - { target: 添加货币, unitId: add_currency, group: admin }
@@ -298,7 +298,7 @@ translations:
     - { target: 添加订阅者, unitId: add_subscriber, group: admin }
     - { target: 添加用户, unitId: add_user, group: admin }
     - { target: 添加工作班次, unitId: add_work_shift, group: admin }
-    - { target: 指定员工, unitId: assigned_employees, group: admin }
+    - { target: 指定人员, unitId: assigned_employees, group: admin }
     - { target: 更好, unitId: better, group: general }
     - { target: 列顺序不应被改变, unitId: column_order_should_not_be_changed, group: pim }
     - { target: 复制活动, unitId: copy_activity, group: time }
@@ -332,7 +332,7 @@ translations:
     - { target: 没有选中的活动, unitId: no_activities_selected, group: time }
     - { target: 没有分配的活动, unitId: no_assigned_activities, group: time }
     - { target: 通知类型, unitId: notification_type, group: admin }
-    - { target: 员工人数, unitId: number_of_employees, group: admin }
+    - { target: 人员人数, unitId: number_of_employees, group: admin }
     - { target: 组织名称, unitId: organization_name, group: admin }
     - { target: 邮件服务器路径, unitId: path_to_sendmail, group: admin }
     - { target: 电话, unitId: phone, group: general }
@@ -369,14 +369,14 @@ translations:
     - { target: 出勤汇总报告, unitId: attendance_total_summary_report, group: attendance }
     - { target: 定义工时表期间, unitId: timesheet_period_config, group: time }
     - { target: 编辑工时表，为, unitId: edit_timesheet_for, group: time }
-    - { target: 员工报告, unitId: employee_report, group: time }
+    - { target: 人员报告, unitId: employee_report, group: time }
     - { target: 应小于24且格式为HH：MM或十进制, unitId: should_be_less_than_24_and_in_hh_mm_or_decimal_format, group: time }
     - { target: 周五, unitId: fri, group: general }
     - { target: 周一, unitId: mon, group: general }
     - { target: 项目报告, unitId: project_report, group: time }
     - { target: 周六, unitId: sat, group: general }
     - { target: 选择一天以创建工时表, unitId: select_a_day_to_create_timesheet, group: time }
-    - { target: 选择员工, unitId: select_employee, group: time }
+    - { target: 选择人员, unitId: select_employee, group: time }
     - { target: 周日, unitId: sun, group: general }
     - { target: 周四, unitId: thu, group: general }
     - { target: 工时表，, unitId: timesheet_for, group: time }
@@ -393,17 +393,17 @@ translations:
     - { target: 帐户类型, unitId: account_type, group: pim }
     - { target: 激活雇佣状态, unitId: activate_employment, group: pim }
     - { target: 添加自定义字段, unitId: add_custom_field, group: pim }
-    - { target: 添加受赡养者, unitId: add_dependent, group: pim }
+    - { target: 添加家庭成员, unitId: add_dependent, group: pim }
     - { target: 添加出入境信息, unitId: add_immigration, group: pim }
     - { target: 添加报告方法, unitId: add_reporting_method, group: pim }
     - { target: 添加终止原因, unitId: add_termination_reason, group: pim }
     - { target: 添加工作经验, unitId: add_work_experience, group: pim }
-    - { target: 分配的受赡养者, unitId: assigned_dependents, group: pim }
+    - { target: 分配的家庭成员, unitId: assigned_dependents, group: pim }
     - { target: 分配的紧急联络人, unitId: assigned_emergency_contacts, group: pim }
     - { target: 指定出入境纪录, unitId: assigned_immigration_records, group: pim }
     - { target: 分配的会员资格, unitId: assigned_memberships, group: pim }
     - { target: 分配的下属, unitId: assigned_subordinates, group: pim }
-    - { target: 分配的上司, unitId: assigned_supervisors, group: pim }
+    - { target: 分配的上级, unitId: assigned_supervisors, group: pim }
     - { target: 需要至少一个电话号码, unitId: at_least_one_phone_number_is_required, group: pim }
     - { target: 孩子, unitId: child, group: pim }
     - { target: 合同细节, unitId: contract_details, group: pim }
@@ -413,14 +413,14 @@ translations:
     - { target: 文档, unitId: document, group: pim }
     - { target: 下拉, unitId: drop_down, group: pim }
     - { target: 编辑自定义字段, unitId: edit_custom_field, group: pim }
-    - { target: 编辑受赡养者, unitId: edit_dependent, group: pim }
+    - { target: 修改家庭成员, unitId: edit_dependent, group: pim }
     - { target: 编辑紧急联络人, unitId: edit_emergency_contact, group: pim }
     - { target: 编辑报告方法, unitId: edit_reporting_method, group: pim }
     - { target: 编辑离职原因, unitId: edit_termination_reason, group: pim }
-    - { target: 员工信息, unitId: employee_information, group: pim }
+    - { target: 人员信息, unitId: employee_information, group: pim }
     - { target: 输入由逗号分隔的允许的选项, unitId: enter_allowed_options_separated_by_commas, group: pim }
     - { target: 豁免, unitId: exemptions, group: pim }
-    - { target: 联邦所得税, unitId: federal_income_tax, group: pim }
+    - { target: 个人所得税, unitId: federal_income_tax, group: pim }
     - { target: 字段名称, unitId: field_name, group: pim }
     - { target: 字段类型, unitId: field_type, group: pim }
     - { target: 起始日期应该早于结束日期, unitId: from_date_should_be_before_to_date, group: general }
@@ -435,10 +435,10 @@ translations:
     - { target: 屏幕, unitId: screen, group: pim }
     - { target: 选择“选项”, unitId: select_options, group: pim }
     - { target: 显示已弃用的字段, unitId: show_deprecated_fields, group: pim }
-    - { target: 在个人资料中显示的昵称，抽烟和军役信息, unitId: show_nick_name_smoker_and_military_service_in_personal_details, group: pim }
+    - { target: 在个人资料中显示的昵称，抽烟和服役信息, unitId: show_nick_name_smoker_and_military_service_in_personal_details, group: pim }
     - { target: 在个人资料中显示社保号, unitId: show_sin_field_in_personal_details, group: pim }
     - { target: 在个人资料中显示SSN, unitId: show_ssn_field_in_personal_details, group: pim }
-    - { target: 显示美国免税菜单, unitId: show_us_tax_exemptions_menu, group: pim }
+    - { target: 显示免税菜单, unitId: show_us_tax_exemptions_menu, group: pim }
     - { target: 社保号, unitId: sin_number, group: pim }
     - { target: 抽烟者, unitId: smoker, group: pim }
     - { target: SSN, unitId: ssn_number, group: pim }
@@ -448,10 +448,10 @@ translations:
     - { target: 失业状态, unitId: unemployment_state, group: pim }
     - { target: 签证, unitId: visa, group: pim }
     - { target: 工作状态, unitId: work_state, group: pim }
-    - { target: 名字(含中间名，如有), unitId: first_middle_name, group: pim }
+    - { target: 名字, unitId: first_middle_name, group: pim }
     - { target: 资格状态, unitId: eligibility_status, group: pim }
     - { target: 资格评估日期, unitId: eligibility_review_date, group: pim }
-    - { target: 行动, unitId: actions, group: general }
+    - { target: 操作, unitId: actions, group: general }
     - { target: 分配, unitId: assign, group: leave }
     - { target: 当前休假期间, unitId: current_leave_period, group: leave }
     - { target: 期间（小时）, unitId: duration_hours, group: attendance }
@@ -487,7 +487,7 @@ translations:
     - { target: 我的休假权利, unitId: my_leave_entitlements, group: leave }
     - { target: 休假申请意见, unitId: leave_request_comments, group: leave }
     - { target: 确认休假分配, unitId: confirm_leave_assignment, group: leave }
-    - { target: 员工没有足够的休假余额作休假申请, unitId: employee_does_not_have_enough_balance_for_leave_request, group: leave }
+    - { target: 人员没有足够的休假余额作休假申请, unitId: employee_does_not_have_enough_balance_for_leave_request, group: leave }
     - { target: 点击OK以确认休假分配, unitId: click_ok_to_confirm_leave_assignment, group: leave }
     - { target: 指定时间, unitId: specify_time, group: leave }
     - { target: 部分天数, unitId: partial_days, group: leave }
@@ -507,14 +507,14 @@ translations:
     - { target: 上班, unitId: in, group: attendance }
     - { target: 下班, unitId: out, group: attendance }
     - { target: 出勤配置, unitId: attendance_configuration, group: attendance }
-    - { target: 上下班打卡时，员工可以更改当前时间, unitId: employee_can_change_current_time_when_punching_in_out, group: attendance }
-    - { target: 员工可以编辑/删除自己的考勤记录, unitId: employee_can_edit_delete_own_attendance_records, group: attendance }
+    - { target: 上下班打卡时，人员可以更改当前时间, unitId: employee_can_change_current_time_when_punching_in_out, group: attendance }
+    - { target: 人员可以编辑/删除自己的考勤记录, unitId: employee_can_edit_delete_own_attendance_records, group: attendance }
     - { target: 上司可以添加/编辑/删除下属的考勤记录, unitId: supervisor_can_add_edit_delete_attendance_records_of_subordinates, group: attendance }
     - { target: 我的出勤记录, unitId: my_attendance_records, group: attendance }
     - { target: 登录, unitId: login, group: auth }
     - { target: 请使用难以猜测的大小写字符文本，符号和数字的组合已组成强密码，, unitId: password_strength_message, group: general }
     - { target: 休假权利, unitId: leave_entitlements, group: leave }
-    - { target: 激动, unitId: buzz, group: general }
+    - { target: 动态, unitId: buzz, group: general }
     - { target: 成功, unitId: success, group: general }
     - { target: 成功删除, unitId: successfully_deleted, group: general }
     - { target: 下班打卡时间应该晚于上班打卡时间, unitId: punch_out_time_should_be_later_than_punch_in_time, group: time }
@@ -526,3 +526,20 @@ translations:
     - { target: 中间名, unitId: middle_name, group: general }
     - { target: 名字, unitId: first_name, group: general }
     - { target: 姓, unitId: last_name, group: general }
+
+    - { target: 单位, unitId: company_name, group: general }
+    - { target: 版本, unitId: version, group: general }
+    - { target: 有效人员, unitId: active_employees, group: general }
+    - { target: 历史人员, unitId: employees_terminated, group: general }
+    - { target: 姓名, unitId: employee_full_name, group: general }
+
+
+    - { target: 个人照片, unitId: change_profile_picture, group: pim }
+    - { target: 电话, unitId: telephone, group: pim }
+    - { target: 地址1, unitId: street1, group: pim }
+    - { target: 地址2, unitId: street2, group: pim }
+    - { target: 办公, unitId: work, group: pim }
+    - { target: 家庭, unitId: home, group: pim }
+
+    - { target: 每周的第一天, unitId: add_timesheet_period_config, group: time }
+