Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
	Dozentenmodul/bin/gui/image/SearchImage_GUI.class

1 files changed, 3 insertions, 3 deletions

diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
index 5ba357f9..54e6d8c8 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -235,9 +235,9 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 		panel_2.setBounds(10, 36, 557, 284);
 		contentPanel.add(panel_2);
 
-		JLabel label_3 = new JLabel("Laborname (Anzeigename): *");
-		label_3.setBounds(10, 25, 180, 14);
-		panel_2.add(label_3);
+		JLabel lblAnzeigename = new JLabel("Anzeigename: *");
+		lblAnzeigename.setBounds(10, 25, 180, 14);
+		panel_2.add(lblAnzeigename);
 
 		txtFldVeranstaltungsname = new JTextField();
 		txtFldVeranstaltungsname.setColumns(10);