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

Conflicts:
	     Dozentenmodul/bin/gui/intro/MainMenue_GUI.class

1 files changed, 12 insertions, 12 deletions

diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
index d0f789f4..9c6b2892 100644
--- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java
@@ -100,7 +100,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		}
 
 		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul *Prototyp*");
+		setTitle("Dozentenmodul *Prototyp* - Image herunterladen");
 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
 		int top = (screenSize.height - 722) / 2;
 		int left = (screenSize.width - 603) / 2;
@@ -217,17 +217,17 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 		panel.setBounds(10, 11, 577, 57);
 		contentPanel.add(panel);
 
-		JLabel label = new JLabel("Eingabe Ihrer Daten");
-		label.setFont(new Font("Tahoma", Font.BOLD, 18));
-		label.setBounds(10, 11, 509, 22);
-		panel.add(label);
-
-		JTextPane textPane = new JTextPane();
-		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-		textPane.setEditable(false);
-		textPane.setBackground(SystemColor.menu);
-		textPane.setBounds(10, 36, 509, 32);
-		panel.add(textPane);
+		JLabel lblImageDownloader = new JLabel("Image Downloader");
+		lblImageDownloader.setFont(new Font("Tahoma", Font.BOLD, 18));
+		lblImageDownloader.setBounds(10, 11, 509, 22);
+		panel.add(lblImageDownloader);
+
+		JTextPane txtpnWhlenSieEinen = new JTextPane();
+		txtpnWhlenSieEinen.setText("W\u00E4hlen Sie einen Ort aus, um das von Ihnen gw\u00E4hlte Image erunter zu laden.");
+		txtpnWhlenSieEinen.setEditable(false);
+		txtpnWhlenSieEinen.setBackground(SystemColor.menu);
+		txtpnWhlenSieEinen.setBounds(10, 36, 509, 32);
+		panel.add(txtpnWhlenSieEinen);
 
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 79, 597, 2);