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

10 files changed, 8 insertions, 8 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 44af4132..a15ca0fe 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index ac7bb679..d3ed0286 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index f0fb5469..15598b45 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
index b5becda3..018c50f4 100644
--- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index de98b04d..e17a79d2 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -912,7 +912,7 @@ public class DeleteImage_GUI extends JFrame {
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
-		JLabel lblInternet = new JLabel("Internet:");
+		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 7c4b654e..3f9d357a 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -768,7 +768,7 @@ public class SearchEditImage_GUI extends JFrame {
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
-		JLabel lblInternet = new JLabel("Internet:");
+		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index cb27e82a..a2ccfc41 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -721,7 +721,7 @@ public class SearchImage_GUI extends JFrame {
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);

 		panel.add(lblLizenzpflichtigeSoftware);

 		

-		JLabel lblInternet = new JLabel("Internet:");

+		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");

 		lblInternet.setBounds(10, 400, 130, 14);

 		panel.add(lblInternet);

 		

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);
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 76503286..86a5a2e7 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -793,7 +793,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
-		JLabel lblInternet = new JLabel("Internet:");
+		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
 		
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index f36e161e..5ca11b98 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -800,7 +800,7 @@ public class EditLectureLink_GUI extends JFrame {
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
 		
-		JLabel lblInternet = new JLabel("Internet:");
+		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);