chinesisch language done

src/ui/view/Languages.java

@@ -203,17 +203,13 @@ public class Languages {
 			"名称", "总能量", "手册", "主动", " 链接至", " 通过ID: ", "边缘: ", " 至 ",
 			"电流流", "最大容量", "状态",
 			// Info SimulationMenu (83-87)
-<<<<<<< HEAD
-			"模拟", "仿真速度:", "计算程序:", "选择“文件夹", "成功" };
-=======
-			"Simulate", "Simulation Speed:", "Algorithm:", "choose folder", "success",
+			"模拟", "仿真速度:", "计算程序:", "选择“文件夹", "成功",
 			// Exit Pop Up (88)
-			"Are you sure you want to exit?",
+			"您确定想要退出?",
 			// Simulation ToolTip (89-93)
-			"Play", "Reset", "Forward", "Backward", "Time Slider",
+			"播放", "复位", "前进", "后退", "时间滑块",
 			// Image Size Slider (94)
-			"Image Size" };
->>>>>>> 98a6bc16d400df041bc34fe5b1e27a65d551ff9a
+			"图片尺寸" };
 
 	public static String[] getLanguage() {
 		switch (languageVar) {